autoload.lua: cosmetic changes

Kacper Michajłow committed 2 years ago

Commit 8dcd5ea1 parent 7d471971 file · +36 −45Browse files

Unified · Split

 -- This script automatically loads playlist entries before and after the
--- the currently played file. It does so by scanning the directory a file is
+-- currently played file. It does so by scanning the directory a file is
 -- located in when starting playback. It sorts the directory entries
 -- alphabetically, and adds entries before and after the current file to
 -- the internal playlist. (It stops if it would add an already existing
 --]]
-local MAXENTRIES = 5000
+local MAX_ENTRIES = 5000
-local MAXDIRSTACK = 20
+local MAX_DIR_STACK = 20
 local msg = require 'mp.msg'
 local options = require 'mp.options'
     ignore_patterns = ""
 }
-local function Set (t)
+local function Set(t)
     local set = {}
     for _, v in pairs(t) do set[v] = true end
     return set
     'svg', 'tga', 'tif', 'tiff', 'webp'
 }
-local EXTENSIONS
+local EXTENSIONS, EXTENSIONS_VIDEO, EXTENSIONS_AUDIO, EXTENSIONS_IMAGES
-local EXTENSIONS_VIDEO
-local EXTENSIONS_AUDIO
-local EXTENSIONS_IMAGES
-local function SetUnion (a,b)
+local function SetUnion(a, b)
     for k in pairs(b) do a[k] = true end
     return a
 end
 -- Returns first and last positions in string or past-to-end indices
-local function FindOrPastTheEnd (string, pattern, start_at)
+local function FindOrPastTheEnd(string, pattern, start_at)
-    local pos1, pos2 = string.find(string, pattern, start_at)
+    local pos1, pos2 = string:find(pattern, start_at)
     return pos1 or #string + 1,
            pos2 or #string + 1
 end
-local function Split (list)
+local function Split(list)
     local set = {}
     local item_pos = 1
 end
 local function get_extension(path)
-    return string.match(path, "%.([^%.]+)$" ) or "nomatch"
+    return path:match("%.([^%.]+)$") or "nomatch"
 end
 local function is_ignored(file)
-    for pattern, _ in pairs(o.ignore_patterns) do
+    for pattern in pairs(o.ignore_patterns) do
-        if string.match(file, pattern) then
+        if file:match(pattern) then
             return true
         end
     end
     return false
 end
     return filenames
 end
-local autoloaded = nil
+local autoloaded
 local added_entries = {}
-local autoloaded_dir = nil
+local autoloaded_dir
 local function scan_dir(path, current_file, dir_mode, separator, dir_depth, total_files, extensions)
-    if dir_depth == MAXDIRSTACK then
+    if dir_depth == MAX_DIR_STACK then
         return
     end
     msg.trace("scanning: " .. path)
     local dirs = dir_mode ~= "ignore" and utils.readdir(path, "dirs") or {}
     local prefix = path == "." and "" or path
-    local filter = function(t, iter)
+    local function filter(t, iter)
         for i = #t, 1, -1 do
             if not iter(t[i]) then
                 table.remove(t, i)
         end
     end
-    filter(files, function (v)
+    filter(files, function(v)
         -- The current file could be a hidden file, ignoring it doesn't load other
         -- files from the current directory.
         local current = prefix .. v == current_file
-        if o.ignore_hidden and not current and string.match(v, "^%.") then
+        if o.ignore_hidden and not current and v:match("^%.") then
             return false
         end
         if not current and is_ignored(v) then
         end
         local ext = get_extension(v)
-        if ext == nil then
+        return ext and extensions[ext:lower()]
-            return false
-        end
-        return extensions[string.lower(ext)]
     end)
     filter(dirs, function(d)
-        return not ((o.ignore_hidden and string.match(d, "^%.")))
+        return not (o.ignore_hidden and d:match("^%."))
     end)
     alphanumsort(files)
     alphanumsort(dirs)
         files[i] = prefix .. file
     end
-    local append = function(t1, t2)
+    local function append(t1, t2)
         local t1_size = #t1
         for i = 1, #t2 do
             t1[t1_size + i] = t2[i]
     local this_ext = get_extension(filename)
     -- check if this is a manually made playlist
     if (pl_count > 1 and autoloaded == nil) or
-       (pl_count == 1 and EXTENSIONS[string.lower(this_ext)] == nil) then
+       (pl_count == 1 and EXTENSIONS[this_ext:lower()] == nil) then
         msg.debug("stopping: manually made playlist")
         return
-    else
+    elseif pl_count == 1 then
-        if pl_count == 1 then
+        autoloaded = true
-            autoloaded = true
+        autoloaded_dir = dir
-            autoloaded_dir = dir
+        added_entries = {}
-            added_entries = {}
-        end
     end
     local extensions
         utils.to_string(pl)))
     local files = {}
-    do
+    scan_dir(autoloaded_dir, path,
-        local dir_mode = o.directory_mode or mp.get_property("directory-mode", "lazy")
+             o.directory_mode or mp.get_property("directory-mode", "lazy"),
-        local separator = mp.get_property_native("platform") == "windows" and "\\" or "/"
+             mp.get_property_native("platform") == "windows" and "\\" or "/",
-        scan_dir(autoloaded_dir, path, dir_mode, separator, 0, files, extensions)
+             0, files, extensions)
-    end
     if next(files) == nil then
         msg.debug("no other files or directories in directory")
             break
         end
     end
-    if current == nil then
+    if not current then
         return
     end
     msg.trace("current file position in files: "..current)
     local append = {[-1] = {}, [1] = {}}
     for direction = -1, 1, 2 do -- 2 iterations, with direction = -1 and +1
-        for i = 1, MAXENTRIES do
+        for i = 1, MAX_ENTRIES do
             local pos = current + i * direction
             local file = files[pos]
             if file == nil or file[1] == "." then
                         mp.commandv("loadfile", file, "append")
                     end
                 end
+                added_entries[file] = true
             end
-            added_entries[file] = true
         end
         if pl_count == 1 and direction == -1 and #append[-1] > 0 then
-            for i = 1, #append[-1] do
+            local load = append[-1]
-                mp.commandv("loadfile", append[-1][i][1], "append")
+            for i = 1, #load do
+                mp.commandv("loadfile", load[i][1], "append")
             end
             mp.commandv("playlist-move", 0, current)
         end

autoload.lua: cosmetic changes

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code