2.5.017

Author: chapmanjacobd

.github/README.md

@@ -95,7 +95,7 @@ To stop playing press Ctrl+C in either the terminal or mpv
 <details><summary>List all subcommands</summary>
 
     $ library
-    xk media library subcommands (v2.5.016)
+    xk media library subcommands (v2.5.017)
 
     Create database subcommands:
     ╭───────────────┬────────────────────────────────────────────────────╮

xklb/__init__.py

@@ -1 +1 @@
-__version__ = "2.5.016"
+__version__ = "2.5.017"

xklb/db_media.py

@@ -185,6 +185,7 @@ def add(args, entry):
 
     tags = entry.pop("tags", None) or ""
     chapters = entry.pop("chapters", None) or []
+    entry.pop("subtitles", None)
     entry.pop("description", None)
 
     media_id = args.db.pop("select id from media where path = ?", [entry["path"]])

xklb/search.py

@@ -96,29 +96,30 @@ def construct_query(args) -> Tuple[str, dict]:
     args.filter_sql.extend([" and " + w for w in args.where])
 
     table = "captions"
-    if args.db["captions"].detect_fts():
-        if args.include:
-            args.table, search_bindings = db_utils.fts_search_sql(
-                "captions",
-                fts_table=args.db["captions"].detect_fts(),
-                include=args.include,
-                exclude=args.exclude,
-                flexible=args.flexible_search,
-            )
-            args.filter_bindings = {**args.filter_bindings, **search_bindings}
-            c_columns = {**c_columns, "rank": int}
-        elif args.exclude:
-            db_utils.construct_search_bindings(args, ["text"])
+    cols = args.cols or ["path", "text", "time", "title"]
+
+    is_fts = args.db["captions"].detect_fts()
+    if is_fts and args.include:
+        table, search_bindings = db_utils.fts_search_sql(
+            "captions",
+            fts_table=is_fts,
+            include=args.include,
+            exclude=args.exclude,
+            flexible=args.flexible_search,
+        )
+        args.filter_bindings = {**args.filter_bindings, **search_bindings}
+        c_columns = {**c_columns, "rank": int}
+        cols.append("id")
+        cols.append("rank")
     else:
         db_utils.construct_search_bindings(args, ["text"])
 
-    cols = args.cols or ["path", "text", "time", "rank", "title"]
     args.select = [c for c in cols if c in {**c_columns, **m_columns, **{"*": "Any"}}]
 
     select_sql = "\n        , ".join(args.select)
     limit_sql = "LIMIT " + str(args.limit) if args.limit else ""
     query = f"""WITH c as (
-        SELECT id, * FROM {table}
+        SELECT * FROM {table}
         WHERE 1=1
             {db_media.filter_args_sql(args, c_columns)}
     )

xklb/tube_backend.py

@@ -1,4 +1,4 @@
-import json, sqlite3, sys
+import json, sys
 from copy import deepcopy
 from pathlib import Path
 from types import ModuleType
@@ -178,18 +178,26 @@ def run(self, info) -> Tuple[list, dict]:  # pylint: disable=arguments-renamed
                 db_playlists.increase_update_delay(args, playlist_path)
 
 
+def yt_subs_config(args):
+    if args.subs:
+        return {"writesubtitles": True, "writeautomaticsub": True}
+    elif args.auto_subs:
+        return {"writesubtitles": False, "writeautomaticsub": True}
+    return {}
+
+
 def get_extra_metadata(args, playlist_path, playlist_dl_opts=None) -> Optional[List[Dict]]:
     yt_dlp = load_module_level_yt_dlp()
 
+    tables = args.db.table_names()
     m_columns = db_utils.columns(args, "media")
 
     with yt_dlp.YoutubeDL(
         tube_opts(
             args,
             func_opts={
                 "subtitlesformat": "srt/best",
-                "writesubtitles": args.subs,
-                "writeautomaticsub": args.auto_subs,
+                **yt_subs_config(args),
                 "subtitleslangs": args.subtitle_languages,
                 "extract_flat": False,
                 "lazy_playlist": False,
@@ -203,27 +211,40 @@ def get_extra_metadata(args, playlist_path, playlist_dl_opts=None) -> Optional[L
                 "ignoreerrors": True,
             },
             playlist_opts=playlist_dl_opts,
-        ),
+        )
     ) as ydl:
-        try:
-            videos = args.db.execute(
+        videos = set(
+            args.db.execute(
                 f"""
                 SELECT
-                id
-                , path
-                , playlists_id
+                    id
+                    , path
+                    , null as playlists_id
                 FROM media
-                WHERE 1=1
-                    AND COALESCE(time_deleted, 0)=0
+                WHERE COALESCE(time_deleted, 0)=0
+                    AND path = ?
                     {'and width is null' if 'width' in m_columns else ''}
-                    and path not like '%playlist%'
-                    and playlists_id = (select id from playlists where path = ?)
-                ORDER by random()
                 """,
                 [playlist_path],
             ).fetchall()
-        except sqlite3.OperationalError:
-            videos = []
+        )
+
+        if "playlists" in tables:
+            videos |= set(
+                args.db.execute(
+                    f"""
+                    SELECT
+                        id
+                        , path
+                        , playlists_id
+                    FROM media
+                    WHERE COALESCE(time_deleted, 0)=0
+                        AND playlists_id = (select id from playlists where path = ?)
+                        {'AND width is null' if 'width' in m_columns else ''}
+                    """,
+                    [playlist_path, playlist_path],
+                ).fetchall()
+            )
 
         current_video_count = 0
         for id, path, playlists_id in videos:
@@ -353,8 +374,7 @@ def out_dir(p):
     if args.profile != DBType.audio:
         func_opts["subtitlesformat"] = "srt/best"
         func_opts["subtitleslangs"] = args.subtitle_languages
-        func_opts["writesubtitles"] = args.subs
-        func_opts["writeautomaticsub"] = args.auto_subs
+        func_opts |= yt_subs_config(args)
         func_opts["postprocessors"].append({"key": "FFmpegEmbedSubtitle"})
 
     def yt_cli_to_api(opts):

xklb/tube_extract.py

@@ -108,7 +108,7 @@ def tube_add(args=None) -> None:
 
             tube_backend.get_playlist_metadata(args, path, tube_backend.tube_opts(args))
 
-            if args.extra:
+            if args.extra or args.subs or args.auto_subs:
                 log.warning("[%s]: Getting extra metadata", path)
                 tube_backend.get_extra_metadata(args, path)
 
@@ -136,6 +136,6 @@ def tube_update(args=None) -> None:
             ),
         )
 
-        if args.extra:
+        if args.extra or args.subs or args.auto_subs:
             log.warning("[%s]: Getting extra metadata", d["path"])
             tube_backend.get_extra_metadata(args, d["path"], playlist_dl_opts=d.get("extractor_config", "{}"))