3.0.048

Author: chapmanjacobd

.github/README.md

@@ -99,7 +99,7 @@ To stop playing press Ctrl+C in either the terminal or mpv
 <details><summary>List all subcommands</summary>
 
     $ library
-    library (v3.0.047; 98 subcommands)
+    library (v3.0.048; 98 subcommands)
 
     Create database subcommands:
     ╭─────────────────┬──────────────────────────────────────────╮

library/__main__.py

@@ -5,7 +5,7 @@
 from library.utils import argparse_utils, iterables
 from library.utils.log_utils import log
 
-__version__ = "3.0.047"
+__version__ = "3.0.048"
 
 progs = {
     "Create database subcommands": {

library/mediadb/playlists.py

@@ -81,7 +81,7 @@ def playlists() -> None:
             {', sum(m.size) size' if 'size' in m_columns else ''}
             , count(*) count
         from media m
-        JOIN ({query}) p on p.rowid = m.playlists_id
+        JOIN ({query}) p on p.id = m.playlists_id
         group by m.playlists_id, coalesce(p.path, "Playlist-less media")
         order by count, p.path
         """

library/utils/arggroups.py

@@ -1565,56 +1565,56 @@ def filter_links(parent_parser):
     parser.add_argument(
         "--path-include",
         "--include-path",
-        nargs="*",
+        nargs="+",
         default=[],
         help="path substrings for inclusion (all must match to include)",
     )
     parser.add_argument(
         "--text-include",
         "--include-text",
-        nargs="*",
+        nargs="+",
         default=[],
         help="link text substrings for inclusion (all must match to include)",
     )
     parser.add_argument(
         "--after-include",
         "--include-after",
-        nargs="*",
+        nargs="+",
         default=[],
         help="plain text substrings after URL for inclusion (all must match to include)",
     )
     parser.add_argument(
         "--before-include",
         "--include-before",
-        nargs="*",
+        nargs="+",
         default=[],
         help="plain text substrings before URL for inclusion (all must match to include)",
     )
     parser.add_argument(
         "--path-exclude",
         "--exclude-path",
-        nargs="*",
+        nargs="+",
         default=["javascript:", "mailto:", "tel:"],
         help="path substrings for exclusion (any must match to exclude)",
     )
     parser.add_argument(
         "--text-exclude",
         "--exclude-text",
-        nargs="*",
+        nargs="+",
         default=[],
         help="link text substrings for exclusion (any must match to exclude)",
     )
     parser.add_argument(
         "--after-exclude",
         "--exclude-after",
-        nargs="*",
+        nargs="+",
         default=[],
         help="plain text substrings after URL for exclusion (any must match to exclude)",
     )
     parser.add_argument(
         "--before-exclude",
         "--exclude-before",
-        nargs="*",
+        nargs="+",
         default=[],
         help="plain text substrings before URL for exclusion (any must match to exclude)",
     )

library/utils/sqlgroups.py

@@ -419,7 +419,7 @@ def construct_download_query(args, dl_status=False) -> tuple[str, dict]:
             {', p.extractor_config' if is_media_playlist and 'extractor_config' in pl_columns else ''}
             {', p.extractor_key' if is_media_playlist and 'extractor_key' in pl_columns else ", 'Playlist-less media' as extractor_key"}
         FROM {args.table} m
-        {'LEFT JOIN playlists p on p.rowid = m.playlists_id' if is_media_playlist else ''}
+        {'LEFT JOIN playlists p on p.id = m.playlists_id' if is_media_playlist else ''}
         WHERE 1=1
             {'and COALESCE(m.time_downloaded,0) = 0' if 'time_downloaded' in m_columns and not dl_status else ''}
             {f'and COALESCE(m.download_attempts,0) <= {args.download_retries}' if 'download_attempts' in m_columns and not dl_status else ''}