demux_playlist: use --directory-filter-types for --autocreate-playlist

Kacper Michajłow committed 2 years ago

Commit 4e50da31 parent ff1f8ba3 files · +22 −20Browse files

Unified · Split

3 files

DOCS/man/options.rst +2 −3
demux/demux.c +1 −1
demux/demux_playlist.c +19 −16

     This is a string list option. See `List Options`_ for details.
-``--autocreate-playlist=<no|any|filter|same>``
+``--autocreate-playlist=<no|filter|same>``
     When opening a local file, act as if the parent directory is opened and
     create a playlist automatically.
     :no:     Load a single file (default).
-    :any:    Create a playlist from the parent directory with any file type.
     :filter: Create a playlist from the parent directory with files matching
-             extensions from any list ``*-exts``.
+             ``--directory-filter-types``.
     :same:   Create a playlist from the parent directory with files matching the
              same category as the currently loaded file. One of the
              ``*-exts`` is selected based on the input file

demux/demux.c+1−1

@@ -120,7 +120,7 @@ const struct m_sub_options demux_conf = { · 119 unmodified lines
120	M_RANGE(0, DBL_MAX)},	120	M_RANGE(0, DBL_MAX)},
121	{"metadata-codepage", OPT_STRING(meta_cp)},	121	{"metadata-codepage", OPT_STRING(meta_cp)},
122	{"autocreate-playlist", OPT_CHOICE(autocreate_playlist,	122	{"autocreate-playlist", OPT_CHOICE(autocreate_playlist,
123	{"no", 0}, {"any", 1}, {"filter", 2}, {"same", 3})},	123	{"no", 0}, {"filter", 1}, {"same", 2})},
124	{0}	124	{0}
125	},	125	},
126	.size = sizeof(struct demux_opts),	126	.size = sizeof(struct demux_opts),

demux/demux_playlist.c+19−16

     return true;
 }
+static enum autocreate_mode get_directory_filter(struct pl_parser *p)
+{
+    enum autocreate_mode autocreate = AUTO_NONE;
+    if (!p->opts->directory_filter || !p->opts->directory_filter[0])
+        autocreate = AUTO_ANY;
+    if (str_in_list(bstr0("video"), p->opts->directory_filter))
+        autocreate |= AUTO_VIDEO;
+    if (str_in_list(bstr0("audio"), p->opts->directory_filter))
+        autocreate |= AUTO_AUDIO;
+    if (str_in_list(bstr0("image"), p->opts->directory_filter))
+        autocreate |= AUTO_IMAGE;
+    return autocreate;
+}
 static int parse_dir(struct pl_parser *p)
 {
     int ret = -1;
     struct stream *stream = p->real_stream;
-    int autocreate = AUTO_NONE;
+    enum autocreate_mode autocreate = AUTO_NONE;
     p->pl->playlist_dir = NULL;
     if (p->autocreate_playlist && p->real_stream->is_local_file && !p->real_stream->is_directory) {
         bstr ext = bstr_get_ext(bstr0(p->real_stream->url));
         switch (p->autocreate_playlist) {
-        case 1: // any
+        case 1: // filter
-            autocreate = AUTO_ANY;
+            autocreate = get_directory_filter(p);
-            break;
-        case 2: // filter
-            autocreate = AUTO_VIDEO | AUTO_AUDIO | AUTO_IMAGE;
             break;
-        case 3: // same
+        case 2: // same
             if (str_in_list(ext, p->mp_opts->video_exts)) {
                 autocreate = AUTO_VIDEO;
             } else if (str_in_list(ext, p->mp_opts->audio_exts)) {
             p->pl->playlist_dir = bstrdup0(p->pl, dir);
         }
     } else {
-        autocreate = AUTO_NONE;
+        autocreate = get_directory_filter(p);
-        if (!p->opts->directory_filter || !p->opts->directory_filter[0])
-            autocreate = AUTO_ANY;
-        if (str_in_list(bstr0("video"), p->opts->directory_filter))
-            autocreate |= AUTO_VIDEO;
-        if (str_in_list(bstr0("audio"), p->opts->directory_filter))
-            autocreate |= AUTO_AUDIO;
-        if (str_in_list(bstr0("image"), p->opts->directory_filter))
-            autocreate |= AUTO_IMAGE;
     }
     if (!stream->is_directory)
         goto done;

demux_playlist: use --directory-filter-types for --autocreate-playlist

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code