fix: query deleted, args.where is a list

Author: chapmanjacobd

xklb/db_media.py

@@ -293,7 +293,7 @@ def filter_args_sql(args, m_columns):
     return f"""
         {'and path like "http%"' if getattr(args, 'safe', False) else ''}
         {f'and path not like "{args.keep_dir}%"' if getattr(args, 'keep_dir', False) and Path(args.keep_dir).exists() else ''}
-        {'and COALESCE(time_deleted,0) = 0' if 'time_deleted' in m_columns and "deleted" not in (getattr(args, 'sort_groups_by',None) or '') and "time_deleted" not in args.where else ''}
+        {'and COALESCE(time_deleted,0) = 0' if 'time_deleted' in m_columns and "deleted" not in (getattr(args, 'sort_groups_by',None) or '') and "time_deleted" not in " ".join(args.where) else ''}
         {'AND (score IS NULL OR score > 7)' if 'score' in m_columns else ''}
         {'AND (upvote_ratio IS NULL OR upvote_ratio > 0.73)' if 'upvote_ratio' in m_columns else ''}
         {'AND COALESCE(time_downloaded,0) = 0' if args.online_media_only and 'time_downloaded' in m_columns else ''}

xklb/play_actions.py

@@ -339,7 +339,7 @@ def ii(string):
         limit = 16 * (args.limit or consts.DEFAULT_PLAY_QUEUE)
         where_not_deleted = (
             "where COALESCE(time_deleted,0) = 0"
-            if "time_deleted" in m_columns and "deleted" not in args.sort_groups_by and "time_deleted" not in args.where
+            if "time_deleted" in m_columns and "deleted" not in args.sort_groups_by and "time_deleted" not in " ".join(args.where)
             else ""
         )
         args.filter_sql.append(

xklb/utils/arg_utils.py

@@ -159,7 +159,7 @@ def parse_args_sort(args) -> None:
             [
                 args.print,
                 consts.PYTEST_RUNNING,
-                "subtitle_count" in args.where,
+                "subtitle_count" in " ".join(args.where),
                 args.limit != consts.DEFAULT_PLAY_QUEUE,
             ],
         )