misc

chapmanjacobd · chapmanjacobd · commit c26a756a5ff0 · 2025-02-07T21:18:07.000-06:00
diff --git a/library/createdb/computers_add.py b/library/createdb/computers_add.py
@@ -2,7 +2,7 @@
 from pathlib import Path
 
 from library import usage
-from library.mediadb import db_playlists
+from library.mediadb import db_media, db_playlists
 from library.utils import arggroups, argparse_utils, consts, db_utils, objects, remote_processes
 from library.utils.log_utils import log
 
@@ -102,4 +102,7 @@ def computer_add(args, hostnames):
 def computers_add():
     args = parse_args()
 
+    db_playlists.create(args)
+    db_media.create(args)
+
     computer_add(args, args.hostnames)
diff --git a/library/createdb/fs_add.py b/library/createdb/fs_add.py
@@ -296,6 +296,8 @@ def fs_add(args=None) -> None:
         sys.argv = ["lb", *args]
 
     args = parse_args(SC.fs_add, usage.fs_add)
+    db_playlists.create(args)
+    db_media.create(args)
     extractor(args, args.paths)
 
 
diff --git a/library/createdb/links_add.py b/library/createdb/links_add.py
@@ -370,9 +370,9 @@ def links_update() -> None:
             new_media = extractor(args_env, playlist["path"])
 
             if new_media > 0:
-                db_playlists.decrease_update_delay(args, playlist["path"])
+                db_playlists.update_more_frequently(args, playlist["path"])
             else:
-                db_playlists.increase_update_delay(args, playlist["path"])
+                db_playlists.update_less_frequently(args, playlist["path"])
 
             if playlist_count > 3:
                 time.sleep(random.uniform(0.05, 2))
diff --git a/library/createdb/reddit_add.py b/library/createdb/reddit_add.py
@@ -364,8 +364,8 @@ def reddit_update(args=None) -> None:
             elif extractor_key == "reddit_praw_redditor":
                 redditor_new(args, {"path": path, "name": name})
 
-            db_playlists.decrease_update_delay(args, playlist["path"])
+            db_playlists.update_more_frequently(args, playlist["path"])
         except skip_errors as e:
-            db_playlists.increase_update_delay(args, playlist["path"])
+            db_playlists.update_less_frequently(args, playlist["path"])
             log.error("[%s] skipping: %s", name, e)
             continue
diff --git a/library/createdb/tabs_add.py b/library/createdb/tabs_add.py
@@ -84,6 +84,8 @@ def tabs_add(args=None) -> None:
     args = parse_args()
     paths = list(gen_paths(args))
 
+    db_media.create(args)
+
     tabs = iterables.list_dict_filter_bool([consolidate_url(args, path) for path in get_new_paths(args, paths)])
     for tab in tabs:
         db_media.add(args, tab)
diff --git a/library/createdb/torrents_add.py b/library/createdb/torrents_add.py
@@ -2,7 +2,7 @@
 from pathlib import Path
 
 from library import usage
-from library.mediadb import db_playlists
+from library.mediadb import db_media, db_playlists
 from library.utils import arg_utils, arggroups, argparse_utils, consts, db_utils, iterables, nums, objects, printing
 from library.utils.file_utils import trash
 from library.utils.log_utils import log
@@ -85,6 +85,9 @@ def extract_metadata(path):
 def torrents_add():
     args = parse_args()
 
+    db_playlists.create(args)
+    db_media.create(args)
+
     scanned_set = set(arg_utils.gen_paths(args, default_exts=(".torrent",)))
 
     known_hashes = set()
diff --git a/library/createdb/tube_add.py b/library/createdb/tube_add.py
@@ -37,6 +37,9 @@ def tube_add(args=None) -> None:
     args = parse_args(SC.tube_add, usage=usage.tube_add)
     paths = arg_utils.gen_paths(args)
 
+    db_playlists.create(args)
+    db_media.create(args)
+
     if args.insert_only:
         args.db["media"].insert_all(
             [
@@ -89,6 +92,7 @@ def tube_update(args=None) -> None:
         sys.argv = ["tubeupdate", *args]
 
     args = parse_args(SC.tube_update, usage=usage.tube_update)
+
     tube_playlists = db_playlists.get_all(
         args,
         sql_filters=["AND extractor_key NOT IN ('Local', 'reddit_praw_redditor', 'reddit_praw_subreddit')"],
diff --git a/library/createdb/tube_backend.py b/library/createdb/tube_backend.py
@@ -172,9 +172,9 @@ def run(self, info) -> tuple[list, dict]:  # pylint: disable=arguments-renamed
 
         if args.action == consts.SC.tube_update:
             if added_media_count > count_before_extract:
-                db_playlists.decrease_update_delay(args, playlist_path)
+                db_playlists.update_more_frequently(args, playlist_path)
             else:
-                db_playlists.increase_update_delay(args, playlist_path)
+                db_playlists.update_less_frequently(args, playlist_path)
 
 
 def yt_subs_config(args):
diff --git a/library/createdb/web_add.py b/library/createdb/web_add.py
@@ -263,6 +263,9 @@ def web_add(args=None) -> None:
 
     args = parse_args(consts.SC.web_add, usage=usage.web_add)
 
+    db_playlists.create(args)
+    db_media.create(args)
+
     if args.insert_only:
         media_new = set()
         media_known = set()
@@ -320,9 +323,9 @@ def web_update(args=None) -> None:
             new_media = spider(args_env, [playlist["path"]])
 
             if new_media > 0:
-                db_playlists.decrease_update_delay(args, playlist["path"])
+                db_playlists.update_more_frequently(args, playlist["path"])
             else:
-                db_playlists.increase_update_delay(args, playlist["path"])
+                db_playlists.update_less_frequently(args, playlist["path"])
 
             if playlist_count > 3:
                 time.sleep(random.uniform(0.05, 2))
diff --git a/library/mediadb/db_history.py b/library/mediadb/db_history.py
@@ -21,9 +21,15 @@ def exists(args, media_id) -> bool:
 def create(args):
     args.db.create_table(
         "history",
-        {"media_id": int, "time_played": int, "playhead": int, "done": int},
+        {
+            "media_id": int,
+            "time_played": int,
+            "playhead": int,
+            "done": bool,
+        },
         pk="id",
         if_not_exists=True,
+        strict=True,
     )
 
 
diff --git a/library/mediadb/db_media.py b/library/mediadb/db_media.py
@@ -1,6 +1,7 @@
 import argparse, os, sqlite3
 from collections.abc import Collection
 from pathlib import Path
+from typing import Counter
 
 from library.createdb import fs_add_metadata
 from library.createdb.subtitle import clean_up_temp_dirs
@@ -9,6 +10,31 @@
 from library.utils.log_utils import log
 
 
+def create(args):
+    args.db.create_table(
+        "media",
+        {
+            "id": int,
+            "playlists_id": int,
+            "time_created": int,
+            "time_modified": int,
+            "time_deleted": int,
+            "time_uploaded": int,
+            "time_downloaded": int,
+            "size": int,
+            "duration": int,
+            # "fps": float,
+            "path": str,
+            # "title": str,
+            # "webpath": str,
+            # "error": str,
+        },
+        pk="id",
+        if_not_exists=True,
+        strict=True,
+    )
+
+
 def exists(args, path) -> bool:
     m_columns = db_utils.columns(args, "media")
     try:
@@ -541,39 +567,56 @@ def get_playlist_media(args, playlist_paths) -> list[dict]:
     return media
 
 
-def get_next_dir_media(args, folder):
+def get_next_dir_media(args, folder, limit=1):
     if args.play_in_order:
-        media = get_dir_media(args, [folder], limit=100)
+        media = get_dir_media(args, [folder], limit=limit * 100)
         media = natsort_media(args, media)
-        m = media[0:1]
+        m = media[0:limit]
     else:
-        m = get_dir_media(args, [folder], limit=1)[0:1]
+        m = get_dir_media(args, [folder], limit=limit)[0:limit]
     return m
 
 
 def get_sibling_media(args, media):
     if args.fetch_siblings in ("all", "always"):
         dirs = {str(Path(d["path"]).parent) + os.sep for d in media}
         media = get_dir_media(args, dirs)
+
     elif args.fetch_siblings == "each":
-        parents = {str(Path(d["path"]).parent) + os.sep for d in media}
+        parent_counts = Counter(str(Path(d["path"]).parent) + os.sep for d in media)
         media = []
-        for parent in parents:
-            media.extend(get_next_dir_media(args, parent))
+        for parent, count in parent_counts.items():
+            media.extend(
+                get_next_dir_media(
+                    args, parent, limit=min(args.fetch_siblings_max, count) if args.fetch_siblings_max > 0 else count
+                )
+            )
+
     elif args.fetch_siblings == "if-audiobook":
         new_media = []
-        seen = set()
+        seen_parents = {}
         for d in media:
             if "audiobook" in d["path"].lower():
                 parent = str(Path(d["path"]).parent) + os.sep
-                if parent not in seen:
-                    seen.add(parent)
-                    new_media.extend(get_next_dir_media(args, parent))
+                if parent not in seen_parents:
+                    seen_parents[parent] = sum(1 for m in media if str(Path(m["path"]).parent) + os.sep == parent)
+                    count = seen_parents[parent]
+                    new_media.extend(
+                        get_next_dir_media(
+                            args,
+                            parent,
+                            limit=min(args.fetch_siblings_max, count) if args.fetch_siblings_max > 0 else count,
+                        )
+                    )
             else:
                 new_media.append(d)
         media = new_media
 
-    # TODO: all-if>10, each-if=10 --folder-counts functionality could be replicated here
+    elif args.fetch_siblings.isdigit():
+        parents = {str(Path(d["path"]).parent) + os.sep for d in media}
+        media = []
+        for parent in parents:
+            media.extend(get_next_dir_media(args, parent, limit=int(args.fetch_siblings)))
 
     return media
 
diff --git a/library/mediadb/db_playlists.py b/library/mediadb/db_playlists.py
@@ -15,6 +15,24 @@
 """
 
 
+def create(args):
+    args.db.create_table(
+        "playlists",
+        {
+            "id": int,
+            "time_created": int,
+            "time_modified": int,
+            "time_deleted": int,
+            "hours_update_delay": int,
+            "path": str,
+            "extractor_config": str,
+        },
+        pk="id",
+        if_not_exists=True,
+        strict=True,
+    )
+
+
 def consolidate(args, v: dict) -> dict:
     upload_time = date_utils.tube_date(v)
 
@@ -93,7 +111,7 @@ def exists(args, playlist_path) -> bool:
 def get_parentpath_playlists_id(args, playlist_path) -> int | None:
     try:
         known = args.db.pop(
-            "select id from playlists where ? like path || '%' and path != ?",
+            "SELECT id FROM playlists WHERE ? LIKE path || '%' AND path != ?",
             [str(playlist_path), str(playlist_path)],
         )
     except sqlite3.OperationalError as e:
@@ -191,7 +209,7 @@ def media_exists(args, playlist_path, path) -> bool:
     return True
 
 
-def decrease_update_delay(args, playlist_path: str) -> None:
+def update_more_frequently(args, playlist_path: str) -> None:
     if "playlists" not in args.db.table_names():
         return
 
@@ -219,7 +237,7 @@ def decrease_update_delay(args, playlist_path: str) -> None:
             raise e
 
 
-def increase_update_delay(args, playlist_path: str) -> None:
+def update_less_frequently(args, playlist_path: str) -> None:
     if "playlists" not in args.db.table_names():
         return
 
diff --git a/library/mediadb/history.py b/library/mediadb/history.py
@@ -2,7 +2,6 @@
 
 from library import usage
 from library.mediadb import db_history
-from library.mediadb.db_history import create
 from library.playback import media_printer
 from library.utils import arggroups, argparse_utils, sqlgroups
 
@@ -30,7 +29,7 @@ def remove_duplicate_data(tbl):
 
 def history() -> None:
     args = parse_args()
-    create(args)
+    db_history.create(args)
 
     if args.completed:
         print("Completed:")
diff --git a/library/mediafiles/process_ffmpeg.py b/library/mediafiles/process_ffmpeg.py
@@ -230,7 +230,7 @@ def process_path(args, path, include_timecode=False, subtitle_streams_unsupporte
             if bitrate >= 256000:
                 ff_opts.extend(["-b:a", "128k"])
             else:
-                ff_opts.extend(["-b:a", "64k", "-frame_duration", "40"])
+                ff_opts.extend(["-b:a", "64k", "-frame_duration", "40", "-apply_phase_inv", "0"])
 
             if source_rate >= 44100:
                 opus_rate = 48000
diff --git a/library/playback/play_actions.py b/library/playback/play_actions.py
@@ -94,6 +94,13 @@ def parse_args(action, default_chromecast=None) -> argparse.Namespace:
 --fetch-siblings always -O        # get 2,000 results per directory
 """,
     )
+    ordering.add_argument(
+        "--fetch-siblings-max",
+        "--siblings-max",
+        type=int,
+        default=8,
+        help="Limit fetch-siblings (no effect to --fetch-siblings all)",
+    )
     ordering.add_argument(
         "--re-rank",
         "--rerank",
diff --git a/library/playback/torrents_info.py b/library/playback/torrents_info.py
diff --git a/library/utils/path_utils.py b/library/utils/path_utils.py
