options: add --archive-exts and --playlist-exts

DOCS/interface-changes/exts.rst

@@ -0,0 +1,4 @@
+add `--archive-exts`
+add `archive` to `--directory-filter-types`' default
+add `--playlist-exts`
+add `playlist` to `--directory-filter-types`' default

DOCS/man/options.rst

@@ -4212,9 +4212,10 @@ Demuxer
     all. The default is ``auto``, which behaves like ``recursive`` with
     ``--shuffle``, and like ``lazy`` otherwise.
 
-``--directory-filter-types=<video,audio,image>``
+``--directory-filter-types=<video,audio,image,archive,playlist>``
     Media file types to filter when opening directory. If the list is empty,
-    all files are added to the playlist. (Default: ``video,audio,image``)
+    all files are added to the playlist. (Default:
+    ``video,audio,image,archive,playlist``)
 
     This is a string list option. See `List Options`_ for details.
 
@@ -7731,6 +7732,20 @@ Miscellaneous
     This is a string list option. See `List Options`_ for details.
     Use ``--help=video-exts`` to see default extensions.
 
+``--archive-exts=ext1,ext2,...``
+    Archive file extentions to try to match when using ``--autocreate-playlist``
+    or ``--directory-filter-types``.
+
+    This is a string list option. See `List Options`_ for details. Use
+    ``--help=archive-exts`` to see the default extensions.
+
+``--playlist-exts=ext1,ext2,...``
+    Playlist file extentions to try to match when using
+    ``--autocreate-playlist`` or ``--directory-filter-types``.
+
+    This is a string list option. See `List Options`_ for details. Use
+    ``--help=playlist-exts`` to see the default extensions.
+
 ``--autoload-files=<yes|no>``
     Automatically load/select external files (default: yes).
 

demux/demux_playlist.c

@@ -44,11 +44,13 @@ enum dir_mode {
 };
 
 enum autocreate_mode {
-    AUTO_NONE  = 0,
-    AUTO_VIDEO = 1 << 0,
-    AUTO_AUDIO = 1 << 1,
-    AUTO_IMAGE = 1 << 2,
-    AUTO_ANY   = 1 << 3,
+    AUTO_NONE     = 0,
+    AUTO_VIDEO    = 1 << 0,
+    AUTO_AUDIO    = 1 << 1,
+    AUTO_IMAGE    = 1 << 2,
+    AUTO_ARCHIVE  = 1 << 3,
+    AUTO_PLAYLIST = 1 << 4,
+    AUTO_ANY      = 1 << 5,
 };
 
 #define OPT_BASE_STRUCT struct demux_playlist_opts
@@ -72,7 +74,7 @@ struct m_sub_options demux_playlist_conf = {
     .defaults = &(const struct demux_playlist_opts){
         .dir_mode = DIR_AUTO,
         .directory_filter = (char *[]){
-            "video", "audio", "image", NULL
+            "video", "audio", "image", "archive", "playlist", NULL
         },
     },
 };
@@ -437,6 +439,10 @@ static bool test_path(struct pl_parser *p, char *path, int autocreate)
         return true;
     if (autocreate & AUTO_IMAGE && str_in_list(ext, p->mp_opts->image_exts))
         return true;
+    if (autocreate & AUTO_ARCHIVE && str_in_list(ext, p->mp_opts->archive_exts))
+        return true;
+    if (autocreate & AUTO_PLAYLIST && str_in_list(ext, p->mp_opts->playlist_exts))
+        return true;
 
     return false;
 }
@@ -520,6 +526,10 @@ static enum autocreate_mode get_directory_filter(struct pl_parser *p)
         autocreate |= AUTO_AUDIO;
     if (str_in_list(bstr0("image"), p->opts->directory_filter))
         autocreate |= AUTO_IMAGE;
+    if (str_in_list(bstr0("archive"), p->opts->directory_filter))
+        autocreate |= AUTO_ARCHIVE;
+    if (str_in_list(bstr0("playlist"), p->opts->directory_filter))
+        autocreate |= AUTO_PLAYLIST;
     return autocreate;
 }
 
@@ -542,6 +552,10 @@ static int parse_dir(struct pl_parser *p)
                 autocreate = AUTO_AUDIO;
             } else if (str_in_list(ext, p->mp_opts->image_exts)) {
                 autocreate = AUTO_IMAGE;
+            } else if (str_in_list(ext, p->mp_opts->archive_exts)) {
+                autocreate = AUTO_ARCHIVE;
+            } else if (str_in_list(ext, p->mp_opts->playlist_exts)) {
+                autocreate = AUTO_PLAYLIST;
             }
             break;
         }

options/options.c

@@ -704,6 +704,8 @@ static const m_option_t mp_opts[] = {
     {"cover-art-auto-exts", OPT_ALIAS("image-exts")},
     {"cover-art-whitelist", OPT_STRINGLIST(coverart_whitelist)},
     {"video-exts", OPT_STRINGLIST(video_exts)},
+    {"archive-exts", OPT_STRINGLIST(archive_exts)},
+    {"playlist-exts", OPT_STRINGLIST(playlist_exts)},
 
     {"", OPT_SUBSTRUCT(subs_rend, mp_subtitle_sub_opts)},
     {"", OPT_SUBSTRUCT(subs_shared, mp_subtitle_shared_sub_opts)},
@@ -1037,6 +1039,12 @@ static const struct MPOpts mp_default_opts = {
         "avif", "bmp", "gif", "heic", "heif", "j2k", "jp2", "jpeg", "jpg",
         "jxl", "png", "qoi", "svg", "tga", "tif", "tiff", "webp", NULL
     },
+    .archive_exts = (char *[]){
+        "zip", "rar", "7z", "cbz", "cbr", NULL
+    },
+    .playlist_exts = (char *[]){
+        "m3u", "m3u8", "pls", "edl", NULL
+    },
 
     .sub_auto_exts = (char *[]){
         "ass",

options/options.h

@@ -332,6 +332,8 @@ typedef struct MPOpts {
     char **image_exts;
     char **coverart_whitelist;
     char **video_exts;
+    char **archive_exts;
+    char **playlist_exts;
     bool osd_bar_visible;
 
     int w32_priority;