2.5.019

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.018)
+    xk media library subcommands (v2.5.019)
 
     Create database subcommands:
     ╭───────────────┬────────────────────────────────────────────────────╮

.gitignore

@@ -1,3 +1,4 @@
+/tests/data/Youtube/
 /TODO
 /.ruff_cache/
 /__pypackages__/

tests/test_dl.py

@@ -1,36 +1,36 @@
 from argparse import Namespace
 
-from xklb.tube_backend import download
+from xklb.lb import library as lb
 from xklb.tube_extract import tube_add
 from xklb.utils.db_utils import connect
 
-PLAYLIST_URL = "https://youtube.com/playlist?list=PLVoczRgDnXDLWV1UJ_tO70VT_ON0tuEdm"
-PLAYLIST_VIDEO_URL = "https://www.youtube.com/watch?v=QoXubRvB6tQ"
+URL = "https://www.youtube.com/watch?v=BaW_jenozKc"
+# PLAYLIST_URL = "https://youtube.com/playlist?list=PLVoczRgDnXDLWV1UJ_tO70VT_ON0tuEdm"
+# PLAYLIST_VIDEO_URL = "https://www.youtube.com/watch?v=QoXubRvB6tQ"
 STORAGE_PREFIX = "tests/data/"
 
 dl_db = ["tests/data/dl.db"]
-tube_db = ["tests/data/tube_dl.db"]
 # tube_add([*dl_db, PLAYLIST_URL])
 
 
 def test_yt():
-    tube_add([*dl_db, PLAYLIST_URL])
+    tube_add([*dl_db, URL])
+    lb(
+        [
+            "dl",
+            *dl_db,
+            "--video",
+            f"--prefix={STORAGE_PREFIX}",
+            "--no-write-thumbnail",  # TODO: test that yt-dlp option is forwarded
+            "--force",
+            "--subs",
+            "-s",
+            URL,
+        ]
+    )
 
-    args = Namespace(
-        database=dl_db[0],
-        profile="video",
-        extractor_config={},
-        prefix=STORAGE_PREFIX,
-        ext=None,
-        ignore_errors=False,
-        small=False,
-        verbose=0,
-        download_archive="test",
-        subtitle_languages=None,
-        subs=False,
-        auto_subs=False,
-        unk=["--no-write-thumbnail"],
-    )  # remember to add args to dl_extract if they need to be added here
+    args = Namespace(database=dl_db[0], verbose=0)
     args.db = connect(args)
-    download(args, {"path": PLAYLIST_VIDEO_URL, "extractor_config": "{}"})
-    # lb(['dl', *dl_db, '--video', f'--prefix={STORAGE_PREFIX}', "--no-write-thumbnail", '--download-archive=test', '--force'])
+
+    captions = list(args.db.query("select * from captions"))
+    assert {"media_id": 2, "time": 3, "text": "For more information contact [email protected]"} in captions

xklb/__init__.py

@@ -1 +1 @@
-__version__ = "2.5.018"
+__version__ = "2.5.019"

xklb/db_media.py

@@ -185,7 +185,7 @@ def add(args, entry):
 
     tags = entry.pop("tags", None) or ""
     chapters = entry.pop("chapters", None) or []
-    entry.pop("subtitles", None)
+    subtitles = entry.pop("subtitles", None) or []
     entry.pop("description", None)
 
     media_id = args.db.pop("select id from media where path = ?", [entry["path"]])
@@ -205,6 +205,8 @@ def add(args, entry):
         args.db["captions"].insert({"media_id": media_id, "time": 0, "text": tags}, alter=True)
     for chapter in chapters:
         args.db["captions"].insert({"media_id": media_id, **chapter}, alter=True)
+    if len(subtitles) > 0:
+        args.db["captions"].insert_all([{**d, "media_id": media_id} for d in subtitles], alter=True)
 
 
 def playlist_media_add(
@@ -246,7 +248,8 @@ def download_add(
             delete_unplayable=False,
             check_corrupt=False,
         )
-        fs_tags = objects.dict_filter_bool(fs_extract.extract_metadata(fs_args, local_path), keep_0=False) or {}
+        fs_tags = fs_extract.extract_metadata(fs_args, local_path)
+        fs_tags = objects.dict_filter_bool(fs_tags, keep_0=False) or {}
         fs_extract.clean_up_temp_dirs()
     else:
         fs_tags = {"time_modified": consts.now()}

xklb/tube_backend.py

@@ -343,7 +343,7 @@ def out_dir(p):
         "ignoreerrors": ignoreerrors,
         "extractor_args": {"youtube": {"skip": ["authcheck"]}},
         "logger": DictLogger(),
-        "skip_download": bool(consts.PYTEST_RUNNING),
+        "skip_download": False,
         "postprocessors": [{"key": "FFmpegMetadata"}],
         "restrictfilenames": True,
         "extract_flat": False,
@@ -355,7 +355,7 @@ def out_dir(p):
         "retries": 12,
         "retry_sleep_functions": {
             "extractor": lambda n: 0.2 * n,
-            "http": lambda n: 0.1 * (2**n),
+            "http": lambda n: 0.08 * (2**n),
             "fragment": lambda n: 0.04 * (2**n),
         },
         "outtmpl": {
@@ -400,14 +400,13 @@ def yt_cli_to_api(opts):
     if args.small:
         if match_filter_user_config is None:
             match_filters.append("duration >? 59 & duration <? 14399")
-        ydl_opts[
-            "format"
-        ] = "bestvideo[height<=576][filesize<2G]+bestaudio/best[height<=576][filesize<2G]/bestvideo[height<=576]+bestaudio/best[height<=576]/best"
+        ydl_opts["format_sort"] = ["res:576"]
+        ydl_opts["format"] = "bestvideo[filesize<2G]+bestaudio/best[filesize<2G]/bestvideo*+bestaudio/best"
 
     if args.profile == DBType.audio:
         ydl_opts[
             "format"
-        ] = "bestaudio[ext=opus]/bestaudio[ext=webm]/bestaudio[ext=ogg]/bestaudio[ext=oga]/bestaudio/best"
+        ] = "bestaudio[ext=opus]/bestaudio[ext=mka]/bestaudio[ext=webm]/bestaudio[ext=ogg]/bestaudio[ext=oga]/bestaudio/best"
         if args.ext is None:
             args.ext = "opus"
         ydl_opts["postprocessors"].append({"key": "FFmpegExtractAudio", "preferredcodec": args.ext})