2.8.010

chapmanjacobd · May 12, 2024 · 01a332a · 01a332a
1 parent 5bac38c
commit 01a332a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 73 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -97,7 +97,7 @@ To stop playing press Ctrl+C in either the terminal or mpv
 <details><summary>List all subcommands</summary>
 
     $ library
-    library (v2.8.009; 72 subcommands)
+    library (v2.8.010; 72 subcommands)
 
     Create database subcommands:
     ╭───────────────┬──────────────────────────────────────────╮

diff --git a/ff.py b/ff.py
diff --git a/xklb/__init__.py b/xklb/__init__.py
@@ -1 +1 @@
-__version__ = "2.8.009"
+__version__ = "2.8.010"
diff --git a/xklb/mediadb/db_media.py b/xklb/mediadb/db_media.py
@@ -390,6 +390,7 @@ def get_dir_media(args, dirs: Collection, include_subdirs=False, limit=2_000) ->
             WHERE 1=1
                 and m.id in (select id from {args.table})
                 {filter_paths}
+                {" ".join(args.filter_sql)}
             GROUP BY m.id, m.path
         )
         SELECT *
@@ -532,13 +533,13 @@ def get_related_media(args, m: dict) -> list[dict]:
             LEFT JOIN history h on h.media_id = m.id
             WHERE 1=1
                 and path != :path
-                {'' if args.related >= consts.RELATED_NO_FILTER else (" ".join(args.filter_sql) or '')}
+                {'' if args.related >= consts.RELATED_NO_FILTER else " ".join(args.filter_sql)}
             GROUP BY m.id, m.path
         )
         SELECT *
         FROM m
         WHERE 1=1
-            {'' if args.related >= consts.RELATED_NO_FILTER else (" ".join(args.aggregate_filter_sql) or '')}
+            {'' if args.related >= consts.RELATED_NO_FILTER else " ".join(args.aggregate_filter_sql)}
         ORDER BY play_count
             , m.path like "http%"
             , {'rank' if 'sort' in args.defaults else f'ntile(1000) over (order by rank)' + (f', {args.sort}' if args.sort else '')}

diff --git a/xklb/utils/arggroups.py b/xklb/utils/arggroups.py
@@ -32,8 +32,12 @@ def get_caller_name():
 
 
 def args_post(args, parser, create_db=False):
-    args.defaults = {k:v for k, v in args.__dict__.items() if parser.get_default(k) == v}
-    settings = {k: v for k, v in args.__dict__.items() if k not in ["database", "verbose", "defaults"] + list(args.defaults.keys())}
+    args.defaults = {k: v for k, v in args.__dict__.items() if parser.get_default(k) == v}
+    settings = {
+        k: v
+        for k, v in args.__dict__.items()
+        if k not in ["database", "verbose", "defaults"] + list(args.defaults.keys())
+    }
     args.extractor_config = {
         k: v for k, v in settings.items() if k not in ["db", "paths", "actions", "backfill_pages"]
     } | (getattr(args, "extractor_config", None) or {})