History

TOOLS/autoload.lua: fix directory_mode and ext options

Operations on option values need to be performed after they are read. Fixes 843161d96e.

Guido Cella committed 2 years ago

Commit e95af5b1 parent cfc651a1 file · +5 −4Browse files

Unified · Split

TOOLS/lua/autoload.lua+5−4
@@ -131,12 +131,10 @@ local function split_option_exts(video, audio, image) · 130 unmodified lines
131 if audio then o.additional_audio_exts = Split(o.additional_audio_exts) end131 if audio then o.additional_audio_exts = Split(o.additional_audio_exts) end
132 if image then o.additional_image_exts = Split(o.additional_image_exts) end132 if image then o.additional_image_exts = Split(o.additional_image_exts) end
133end133end
134split_option_exts(true, true, true)
135 134
136local function split_patterns()135local function split_patterns()
137 o.ignore_patterns = Split(o.ignore_patterns)136 o.ignore_patterns = Split(o.ignore_patterns)
138end137end
139split_patterns()
140 138
141local function create_extensions()139local function create_extensions()
142 if o.videos then140 if o.videos then
@@ -152,7 +150,6 @@ local function create_extensions() · 9 unmodified lines
152 SetUnion(EXTENSIONS, EXTENSIONS_IMAGES)150 SetUnion(EXTENSIONS, EXTENSIONS_IMAGES)
153 end151 end
154end152end
155create_extensions()
156 153
157local function validate_directory_mode()154local function validate_directory_mode()
158 if o.directory_mode ~= "recursive" and o.directory_mode ~= "lazy"155 if o.directory_mode ~= "recursive" and o.directory_mode ~= "lazy"
@@ -160,7 +157,6 @@ local function validate_directory_mode() · 1 unmodified line
160 o.directory_mode = nil157 o.directory_mode = nil
161 end158 end
162end159end
163validate_directory_mode()
164 160
165options.read_options(o, nil, function(list)161options.read_options(o, nil, function(list)
166 split_option_exts(list.additional_video_exts, list.additional_audio_exts,162 split_option_exts(list.additional_video_exts, list.additional_audio_exts,
@@ -175,6 +171,11 @@ options.read_options(o, nil, function(list) · 8 unmodified lines
175 end171 end
176end)172end)
177 173
174split_option_exts(true, true, true)
175split_patterns()
176create_extensions()
177validate_directory_mode()
178
178local function add_files(files)179local function add_files(files)
179 local oldcount = mp.get_property_number("playlist-count", 1)180 local oldcount = mp.get_property_number("playlist-count", 1)
180 for i = 1, #files do181 for i = 1, #files do

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t