library 3.2.4__tar.gz → 3.2.5__tar.gz

{library-3.2.4 → library-3.2.5}/.github/README.md

@@ -99,7 +99,7 @@ To stop playing press Ctrl+C in either the terminal or mpv
 <details><summary>List all subcommands</summary>
 
     $ library
-    library (v3.2.004; 102 subcommands)
+    library (v3.2.005; 102 subcommands)
 
     Create database subcommands:
     ╭─────────────────┬──────────────────────────────────────────╮
@@ -2190,10 +2190,20 @@ Inspired somewhat by https://nikkhokkho.sourceforge.io/?page=FileOptimizer
 <details><summary>Start torrents (qBittorrent-nox)</summary>
 
     $ library torrents-start -h
-    usage: library torrents-start [--prefix /mnt/d/] PATH ...
+    usage: library torrents-start [--prefix /mnt/d/] [--scan] PATH ...
 
     Start torrent files in qBittorrent-nox
 
+    By default the temp/download paths are derived from the configured drives and
+    prefixes (and optional tracker subdirectories). With --scan, the temp and download
+    drive prefixes are searched to locate each torrent's files on disk. If
+    --tracker-dirnames is also set, the tracker subdirectories of each prefix are
+    searched as well. Files found under the temp/downloading prefix are used as the
+    download_path (temp), and files under the download/seeding prefix as the save_path,
+    so qBittorrent hash-scans and moves any incomplete data into place. Torrents with
+    no file matches are logged, skipped, and their .torrent files are left in place.
+    --scan overrides the --tracker-dirnames layout when choosing save paths.
+
 
 </details>
 

{library-3.2.4 → library-3.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: library
-Version: 3.2.4
+Version: 3.2.5
 Summary: xk media library
 Author-Email: Jacob Chapman <7908073+chapmanjacobd@users.noreply.github.com>
 License: BSD 3-Clause License
@@ -207,7 +207,7 @@ To stop playing press Ctrl+C in either the terminal or mpv
 <details><summary>List all subcommands</summary>
 
     $ library
-    library (v3.2.004; 102 subcommands)
+    library (v3.2.005; 102 subcommands)
 
     Create database subcommands:
     ╭─────────────────┬──────────────────────────────────────────╮
@@ -2298,10 +2298,20 @@ Inspired somewhat by https://nikkhokkho.sourceforge.io/?page=FileOptimizer
 <details><summary>Start torrents (qBittorrent-nox)</summary>
 
     $ library torrents-start -h
-    usage: library torrents-start [--prefix /mnt/d/] PATH ...
+    usage: library torrents-start [--prefix /mnt/d/] [--scan] PATH ...
 
     Start torrent files in qBittorrent-nox
 
+    By default the temp/download paths are derived from the configured drives and
+    prefixes (and optional tracker subdirectories). With --scan, the temp and download
+    drive prefixes are searched to locate each torrent's files on disk. If
+    --tracker-dirnames is also set, the tracker subdirectories of each prefix are
+    searched as well. Files found under the temp/downloading prefix are used as the
+    download_path (temp), and files under the download/seeding prefix as the save_path,
+    so qBittorrent hash-scans and moves any incomplete data into place. Torrents with
+    no file matches are logged, skipped, and their .torrent files are left in place.
+    --scan overrides the --tracker-dirnames layout when choosing save paths.
+
 
 </details>
 

{library-3.2.4 → library-3.2.5}/library/__main__.py

@@ -5,7 +5,7 @@ from tabulate import tabulate
 from library.utils import argparse_utils, iterables
 from library.utils.log_utils import log
 
-__version__ = "3.2.004"
+__version__ = "3.2.005"
 
 progs = {
     "Create database subcommands": {
@@ -367,12 +367,13 @@ def library(args=None) -> None:
     log.debug(sys.argv)
 
     if hasattr(args, "func"):
+        subcommand = sys.argv[1] if len(sys.argv) >= 2 else ""
         if len(sys.argv) >= 2:
             del sys.argv[1]
         try:
             return args.func()
         except Exception:
-            print("Bug found in", " ".join(sys.argv), file=sys.stderr)
+            print("Bug found in", subcommand, " ".join(sys.argv), file=sys.stderr)
             raise
     else:
         try:

{library-3.2.4 → library-3.2.5}/library/fsdb/disk_usage.py

@@ -50,11 +50,12 @@ def parse_args(defaults_override=None):
     return args
 
 
-def sort_by(args):
-    if args.sort_groups_by:
-        key = args.sort_groups_by.replace(" desc", "")
-        if key != "priority":
-            return lambda x: (x.get(key) or 0, objects.Reverser(x.get("path")))
+def sort_by(args, default_sort="priority"):
+    sort_groups_by = args.sort_groups_by or default_sort
+    if sort_groups_by:
+        keys = [key.replace(" desc", "") for key in sort_groups_by.split(",")]
+        if keys != ["priority"]:
+            return lambda x: (*[x.get(key) or 0 for key in keys], objects.Reverser(x.get("path")))
 
     # priority sort
     return lambda x: (
@@ -170,7 +171,11 @@ def get_subset_group_by_extensions(args) -> list[dict]:
     if args.sort_groups_by and " desc" in args.sort_groups_by:
         reverse = False
 
-    return sorted([{"path": k, **v} for k, v in d.items()], key=sort_by(args), reverse=reverse)
+    return sorted(
+        [{"path": k, **v} for k, v in d.items()],
+        key=sort_by(args, default_sort="size,count"),
+        reverse=reverse,
+    )
 
 
 def get_subset_group_by_mimetypes(args) -> list[dict]:

{library-3.2.4 → library-3.2.5}/library/mediafiles/torrents_start.py

@@ -1,4 +1,4 @@
-import getpass, shutil, time
+import getpass, os, shutil, time
 from pathlib import Path
 from time import sleep
 
@@ -102,28 +102,92 @@ def start_qBittorrent(args):
     return qbt_client
 
 
+def scan_torrent_location(torrent, roots, max_depth=3):
+    if torrent.num_files() == 0:
+        return None, None
+    first_file = Path(next(iter(torrent.files())).path)
+    for root in roots:
+        root = Path(root)
+        if not root.is_dir():
+            continue
+        for dirpath, dirnames, _filenames in os.walk(root):
+            depth = len(Path(dirpath).relative_to(root).parts)
+            if depth > max_depth:
+                dirnames[:] = []
+                continue
+            if (Path(dirpath) / first_file).exists():
+                return root, Path(dirpath)
+    return None, None
+
+
+def torrent_paths(args, torrent, temp_prefix, download_prefix):
+    if args.scan:
+        roots = [temp_prefix, download_prefix]
+        if args.tracker_dirnames:
+            tracker = get_tracker_domain(torrent)
+            if tracker:
+                roots += [temp_prefix / tracker, download_prefix / tracker]
+        root, location = scan_torrent_location(torrent, roots)
+        if not location:
+            return None, None
+        log.debug("Found files for %s at %s (root %s)", torrent.name(), location, root)
+
+        if root == temp_prefix or temp_prefix in root.parents:
+            # files live under the temp/downloading prefix: keep them as the temp path,
+            # and let the download prefix be the final save path
+            return download_prefix, location
+        # files live under the download/seeding prefix: use them as the final save path,
+        # and the temp prefix as where any incomplete data would go
+        return location, temp_prefix
+
+    download_path = download_prefix
+    temp_path = temp_prefix
+    if args.tracker_dirnames:
+        tracker = get_tracker_domain(torrent)
+        if tracker:
+            download_path /= tracker
+            temp_path /= tracker
+    return download_path, temp_path
+
+
 def torrents_start():
     args = parse_args()
 
     qbt_client = start_qBittorrent(args)
 
     if args.temp_drive and Path(args.temp_drive).is_absolute():
-        temp_prefix = Path(args.temp_drive)
+        temp_drive = Path(args.temp_drive)
     else:
-        temp_prefix = Path(args.download_drive)
-    temp_prefix /= args.temp_prefix
-    download_prefix = Path(args.download_drive) / args.download_prefix
+        temp_drive = Path(args.download_drive)
 
-    for path in args.paths:
+    if "download_drive" in args.defaults and args.temp_drive:
+        # --temp-drive set but not --download-drive: use the same drive for both prefixes
+        download_drive = temp_drive
+    else:
+        download_drive = Path(args.download_drive)
+    temp_prefix = temp_drive / args.temp_prefix
+    download_prefix = download_drive / args.download_prefix
+
+    paths = []
+    for p in args.paths:
+        p = Path(p)
+        if p.is_dir():
+            paths.extend(p.glob("*.torrent"))
+        else:
+            paths.append(p)
+
+    for path in paths:
         torrent = torrent_decode(path)
 
-        download_path = download_prefix
-        temp_path = temp_prefix
-        if args.tracker_dirnames:
-            tracker = get_tracker_domain(torrent)
-            if tracker:
-                download_path /= tracker
-                temp_path /= tracker
+        download_path, temp_path = torrent_paths(args, torrent, temp_prefix, download_prefix)
+        if download_path is None:
+            log.warning(
+                "Skipping %s: no file matches under %s or %s (torrent file left in place)",
+                path,
+                temp_prefix,
+                download_prefix,
+            )
+            continue
 
         qbt_client.torrents_add(
             torrent_files=path,

{library-3.2.4 → library-3.2.5}/library/usage.py

@@ -1961,9 +1961,19 @@ torrents_add = """library torrents-add DATABASE PATH ...
 """
 
 
-torrents_start = """library torrents-start [--prefix /mnt/d/] PATH ...
+torrents_start = """library torrents-start [--prefix /mnt/d/] [--scan] PATH ...
 
     Start torrent files in qBittorrent-nox
+
+    By default the temp/download paths are derived from the configured drives and
+    prefixes (and optional tracker subdirectories). With --scan, the temp and download
+    drive prefixes are searched to locate each torrent's files on disk. If
+    --tracker-dirnames is also set, the tracker subdirectories of each prefix are
+    searched as well. Files found under the temp/downloading prefix are used as the
+    download_path (temp), and files under the download/seeding prefix as the save_path,
+    so qBittorrent hash-scans and moves any incomplete data into place. Torrents with
+    no file matches are logged, skipped, and their .torrent files are left in place.
+    --scan overrides the --tracker-dirnames layout when choosing save paths.
 """
 
 torrents_dump = """library torrents-dump PATH ...

{library-3.2.4 → library-3.2.5}/library/utils/arggroups.py

@@ -2717,6 +2717,12 @@ def torrents_start(parser):
     parser.add_argument(
         "--delete-torrent", action=argparse.BooleanOptionalAction, default=True, help="Delete torrent file after adding"
     )
+    parser.add_argument(
+        "--scan",
+        action="store_true",
+        help="Scan the temp/download drives (and their prefixes) to find where each torrent's files are, "
+        "and set both the temp and download paths to that location (overrides --tracker-dirnames)",
+    )
 
 
 def qBittorrent_torrents(parent_parser):

{library-3.2.4 → library-3.2.5}/library/utils/filter_engine.py

@@ -427,10 +427,10 @@ def filter_items_by_criteria(args, items):
 
     if getattr(args, "time_created", []):
         items = [d if "time_created" in d else file_utils.get_file_stats(d) for d in items]
-        items = [d for d in items if d["time_created"] > 0 and args.time_created(d["time_created"])]  # type: ignore
+        items = [d for d in items if d.get("time_created", 0) > 0 and args.time_created(d["time_created"])]  # type: ignore
     if getattr(args, "time_modified", []):
         items = [d if "time_modified" in d else file_utils.get_file_stats(d) for d in items]
-        items = [d for d in items if d["time_modified"] > 0 and args.time_modified(d["time_modified"])]  # type: ignore
+        items = [d for d in items if d.get("time_modified", 0) > 0 and args.time_modified(d["time_modified"])]  # type: ignore
 
     if getattr(args, "to_json", False):
         items = [d if "size" in d else file_utils.get_file_stats(d) for d in items]

{library-3.2.4 → library-3.2.5}/library/utils/processes.py

@@ -246,16 +246,16 @@ def cmd_detach(*command, **kwargs) -> subprocess.CompletedProcess:
 
 
 def cmd_interactive(*command, strict=True) -> subprocess.CompletedProcess:
-    return_code = os.spawnvpe(os.P_WAIT, command[0], command, os.environ)
+    result = subprocess.run(command, check=False)
 
-    if return_code != 0:
-        msg = f"[{shlex.join(command)}] exited {return_code}"
+    if result.returncode != 0:
+        msg = f"[{shlex.join(command)}] exited {result.returncode}"
         if strict:
             raise RuntimeError(msg)
         else:
             log.info(msg)
 
-    return subprocess.CompletedProcess(command, return_code)
+    return result
 
 
 def Pclose(process) -> subprocess.CompletedProcess:  # noqa: N802

{library-3.2.4 → library-3.2.5}/library/utils/web.py

@@ -1,4 +1,4 @@
-import argparse, datetime, functools, http.cookiejar, os, pathlib, random, re, socket, tempfile, time, urllib.error, urllib.parse, urllib.request, warnings
+import argparse, datetime, functools, http.cookiejar, os, pathlib, random, re, shutil, socket, tempfile, time, urllib.error, urllib.parse, urllib.request, warnings
 from contextlib import suppress
 from email.message import Message
 from pathlib import Path
@@ -322,6 +322,35 @@ def _firefox_default_profile(root):
     return next((p for p in (profiles.get(s, "Path", fallback=None) for s in sections) if p), None)
 
 
+def copy_firefox_profile_for_selenium(source_profile, selenium_profile):
+    selenium_profile.mkdir(parents=True, exist_ok=True)
+    source_cookies = source_profile / "cookies.sqlite"
+    if source_cookies.exists():
+        for suffix in ("", "-wal", "-shm"):
+            src_file = source_cookies.with_suffix(source_cookies.suffix + suffix)
+            if src_file.exists():
+                shutil.copy2(src_file, selenium_profile / src_file.name)
+    for name in ("logins.json", "key4.db", "cert9.db", "permissions.sqlite"):
+        src_file = source_profile / name
+        if src_file.exists():
+            shutil.copy2(src_file, selenium_profile / name)
+
+
+SKIP_CHROMIUM_DIRS = {"Cache", "Code Cache", "GPUCache", "Service Worker", "Service Worker/CacheStorage", "Session Storage", "Sessions", "databases", "blob_storage", "File System", "IndexedDB", "WebStorage", "GamepadMappings", "safe_browsing", "SafetyTips", "Subresource Filter", "BudgetDatabase", "CELPuzzles", "Crowd Deny", "MEIPreload", "Segmentation Platform", "TranslateRanker", "TranslateScripts", "VideoDecodeStats"}
+
+
+def copy_chromium_profile_for_selenium(source_profile, selenium_profile):
+    source_profile = Path(source_profile)
+    selenium_profile = Path(selenium_profile)
+    for item in source_profile.iterdir():
+        if item.name in SKIP_CHROMIUM_DIRS or item.name in {"LOCK", "LOG", "LOG.old"} or item.name.startswith(".org.chromium."):
+            continue
+        if item.is_dir():
+            shutil.copytree(item, selenium_profile / item.name, ignore=shutil.ignore_patterns("*.lock", "LOCK"))
+        else:
+            shutil.copy2(item, selenium_profile / item.name)
+
+
 def load_selenium(args, wire=False):
     if getattr(args, "driver", False):
         return
@@ -334,6 +363,7 @@ def load_selenium(args, wire=False):
         resolved = get_browser_profile_path(browser_name, profile)
         if resolved:
             args.user_data_dir = resolved
+            args.profile_directory = profile
             _profile = profile
             log.info("Using browser profile: %s", resolved)
             if browser_name == "firefox" and not getattr(args, "chrome", False):
@@ -370,6 +400,16 @@ def load_selenium(args, wire=False):
 
         service = Service(log_path=tempfile.mktemp(".geckodriver.log"))
         options = Options()
+
+        _using_real_profile = bool(args.user_data_dir)
+        if _using_real_profile:
+            _real_profile = Path(args.user_data_dir)
+            _selenium_profile = Path(tempfile.mkdtemp(prefix="ff_selenium_")) / "profile"
+            copy_firefox_profile_for_selenium(_real_profile, _selenium_profile)
+            args.selenium_profile_dir = _selenium_profile
+            args.user_data_dir = str(_selenium_profile)
+            log.info("Selenium profile: %s (cookies from %s)", _selenium_profile, _real_profile)
+
         if args.user_data_dir:
             options.add_argument("--profile")
             options.add_argument(args.user_data_dir)
@@ -380,7 +420,7 @@ def load_selenium(args, wire=False):
 
         args.driver = webdriver.Firefox(service=service, options=options)
 
-        if not args.user_data_dir:
+        if not _using_real_profile:
             addons = [Path("~/.local/lib/ublock_origin.xpi").expanduser().resolve()]
             if getattr(args, "auto_pager", False):
                 addons.append(Path("~/.local/lib/weautopagerize.xpi").expanduser().resolve())
@@ -401,25 +441,43 @@ def load_selenium(args, wire=False):
         from selenium.webdriver.chrome.options import Options
 
         options = Options()
+
+        _using_real_profile = bool(args.user_data_dir)
+        if _using_real_profile:
+            _real_profile = Path(args.user_data_dir)
+            _profile_name = _profile or "Default"
+            _real_profile_dir = _real_profile / _profile_name
+            _selenium_profile = Path(tempfile.mkdtemp(prefix="chrome_selenium_"))
+            copy_chromium_profile_for_selenium(_real_profile_dir, _selenium_profile / _profile_name)
+            for name in ("Local State",):
+                src_file = _real_profile / name
+                if src_file.exists():
+                    shutil.copy2(src_file, _selenium_profile / name)
+            args.selenium_profile_dir = _selenium_profile
+            args.user_data_dir = str(_selenium_profile)
+            log.info("Selenium profile: %s (cookies from %s)", _selenium_profile, _real_profile_dir)
+
         if args.user_data_dir:
             options.add_argument(f"--user-data-dir={args.user_data_dir}")
-            if _profile:
+            if _using_real_profile:
+                options.add_argument(f"--profile-directory={_profile_name}")
+            elif _profile:
                 options.add_argument(f"--profile-directory={_profile}")
-
-        options.add_experimental_option(
-            "prefs",
-            {
-                "credentials_enable_service": False,
-                "profile.password_manager_enabled": False,
-                "profile.default_content_setting_values.notifications": 2,
-            },
-        )
+        else:
+            options.add_experimental_option(
+                "prefs",
+                {
+                    "credentials_enable_service": False,
+                    "profile.password_manager_enabled": False,
+                    "profile.default_content_setting_values.notifications": 2,
+                },
+            )
         options.add_argument("--disable-notifications")
         options.add_argument("--mute-audio")
         if xvfb is False:
             options.add_argument("--headless=new")
 
-        if not args.user_data_dir:
+        if not _using_real_profile:
             addons = [Path("~/.local/lib/ublock_origin.crx").expanduser().resolve()]
             if getattr(args, "auto_pager", False):
                 addons.append(Path("~/.local/lib/autopager.crx").expanduser().resolve())
@@ -437,6 +495,9 @@ def load_selenium(args, wire=False):
 
 def quit_selenium(args):
     args.driver.quit()
+    _selenium_dir = getattr(args, "selenium_profile_dir", None)
+    if _selenium_dir:
+        shutil.rmtree(_selenium_dir, ignore_errors=True)
     if args.verbose < consts.LOG_DEBUG and not getattr(args, "manual", False):
         with suppress(Exception):
             args.driver_display.stop()

{library-3.2.4 → library-3.2.5}/pyproject.toml

@@ -35,7 +35,7 @@ dynamic = []
 name = "library"
 readme = ".github/README.md"
 requires-python = ">=3.12"
-version = "3.2.4"
+version = "3.2.5"
 
 [project.license]
 file = "LICENSE"