library 3.2.5__tar.gz → 3.2.7__tar.gz

{library-3.2.5 → library-3.2.7}/.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.005; 102 subcommands)
+    library (v3.2.007; 102 subcommands)
 
     Create database subcommands:
     ╭─────────────────┬──────────────────────────────────────────╮
@@ -2178,10 +2178,14 @@ Inspired somewhat by https://nikkhokkho.sourceforge.io/?page=FileOptimizer
 <details><summary>Print torrent file info</summary>
 
     $ library torrents-dump -h
-    usage: library torrents-dump PATH ...
+    usage: library torrents-dump [--trackers] PATH ...
 
     View torrent file metadata via libtorrent
 
+    Aggregate torrent metadata by tracker domain:
+
+        library torrents-dump --trackers PATH ...
+
 
 </details>
 
@@ -3042,6 +3046,22 @@ Inspired somewhat by https://nikkhokkho.sourceforge.io/?page=FileOptimizer
 
         library torrents query
 
+    Positional torrent searches use the path aligned with torrent status by default.
+    Search a specific path field or both fields with --path-search:
+
+        library torrents --dl --path-search save /mnt/d4/
+        library torrents --dl --path-search both /mnt/d4/
+
+    Find incomplete torrents whose temp and final paths use different drives.
+    --different-drives searches both path fields unless --path-search is specified:
+
+        library torrents --dl --different-drives
+        library torrents --dl --different-drives /mnt/d4/
+
+    Find incomplete torrents whose temp and final paths use the same drive:
+
+        library torrents --dl --same-drives
+
     Aggregate torrent info (torrents-status)
 
         library torrents -pa
@@ -3058,6 +3078,10 @@ Inspired somewhat by https://nikkhokkho.sourceforge.io/?page=FileOptimizer
 
         library torrents --dl --progress=+10% --force-start
 
+    Find torrents with a recorded completion timestamp
+
+        library torrents --completed
+
     Stop completed downloads
 
         library torrents -S+5MiB --seeders=+5 --time-stalled=+45days --time-active=+180days --stop
@@ -3082,6 +3106,7 @@ Inspired somewhat by https://nikkhokkho.sourceforge.io/?page=FileOptimizer
     When --delete-rows is provided, the metadata is removed from qBittorrent
     When --delete-files is provided, the downloaded files are deleted
     When --delete-incomplete 80% is provided, any files that were downloaded less than 80% are deleted
+    When --reset-progress is provided, the downloaded files are deleted and progress is reset without removing the torrents
 
 
 </details>

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: library
-Version: 3.2.5
+Version: 3.2.7
 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.005; 102 subcommands)
+    library (v3.2.007; 102 subcommands)
 
     Create database subcommands:
     ╭─────────────────┬──────────────────────────────────────────╮
@@ -2286,10 +2286,14 @@ Inspired somewhat by https://nikkhokkho.sourceforge.io/?page=FileOptimizer
 <details><summary>Print torrent file info</summary>
 
     $ library torrents-dump -h
-    usage: library torrents-dump PATH ...
+    usage: library torrents-dump [--trackers] PATH ...
 
     View torrent file metadata via libtorrent
 
+    Aggregate torrent metadata by tracker domain:
+
+        library torrents-dump --trackers PATH ...
+
 
 </details>
 
@@ -3150,6 +3154,22 @@ Inspired somewhat by https://nikkhokkho.sourceforge.io/?page=FileOptimizer
 
         library torrents query
 
+    Positional torrent searches use the path aligned with torrent status by default.
+    Search a specific path field or both fields with --path-search:
+
+        library torrents --dl --path-search save /mnt/d4/
+        library torrents --dl --path-search both /mnt/d4/
+
+    Find incomplete torrents whose temp and final paths use different drives.
+    --different-drives searches both path fields unless --path-search is specified:
+
+        library torrents --dl --different-drives
+        library torrents --dl --different-drives /mnt/d4/
+
+    Find incomplete torrents whose temp and final paths use the same drive:
+
+        library torrents --dl --same-drives
+
     Aggregate torrent info (torrents-status)
 
         library torrents -pa
@@ -3166,6 +3186,10 @@ Inspired somewhat by https://nikkhokkho.sourceforge.io/?page=FileOptimizer
 
         library torrents --dl --progress=+10% --force-start
 
+    Find torrents with a recorded completion timestamp
+
+        library torrents --completed
+
     Stop completed downloads
 
         library torrents -S+5MiB --seeders=+5 --time-stalled=+45days --time-active=+180days --stop
@@ -3190,6 +3214,7 @@ Inspired somewhat by https://nikkhokkho.sourceforge.io/?page=FileOptimizer
     When --delete-rows is provided, the metadata is removed from qBittorrent
     When --delete-files is provided, the downloaded files are deleted
     When --delete-incomplete 80% is provided, any files that were downloaded less than 80% are deleted
+    When --reset-progress is provided, the downloaded files are deleted and progress is reset without removing the torrents
 
 
 </details>

{library-3.2.5 → library-3.2.7}/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.005"
+__version__ = "3.2.007"
 
 progs = {
     "Create database subcommands": {

library-3.2.7/library/mediafiles/torrents_dump.py

@@ -0,0 +1,89 @@
+#!/usr/bin/python3
+
+from concurrent.futures import ThreadPoolExecutor
+from pathlib import Path
+
+from library import usage
+from library.createdb import torrents_add
+from library.utils import arggroups, argparse_utils, printing, strings
+
+
+def parse_args():
+    parser = argparse_utils.ArgumentParser(usage=usage.torrents_dump)
+    arggroups.debug(parser)
+
+    parser.add_argument("--trackers", action="store_true", help="Aggregate torrent metadata by tracker")
+    arggroups.paths_or_stdin(parser)
+    args = parser.parse_args()
+    arggroups.args_post(args, parser)
+    return args
+
+
+def gen_torrents(l):
+    for s in l:
+        p = Path(s)
+        if p.is_dir():
+            for file in p.rglob("*.torrent"):
+                if not file.is_dir():
+                    yield file
+        elif p.is_file() and p.suffix == ".torrent":
+            yield p
+
+
+def aggregate_trackers(torrents):
+    trackers = {}
+    for _, torrent in torrents:
+        tracker = torrent["tracker"]
+        stats = trackers.setdefault(tracker, {"tracker": tracker, "count": 0, "size": 0})
+        stats["count"] += 1
+        stats["size"] += torrent["size"]
+
+    return [
+        {**stats, "size": strings.file_size(stats["size"])}
+        for stats in sorted(trackers.values(), key=lambda d: (d["size"], d["tracker"] or ""))
+    ]
+
+
+def torrents_dump():
+    args = parse_args()
+
+    torrent_files = list(gen_torrents(args.paths))
+    with ThreadPoolExecutor() as executor:
+        metadata_results = executor.map(torrents_add.extract_metadata, torrent_files)
+    torrents = list(zip(torrent_files, metadata_results))
+
+    if args.trackers:
+        tracker_stats = aggregate_trackers(torrents)
+        if tracker_stats:
+            printing.table(tracker_stats)
+        return
+
+    rows = []
+    for torrent_path, d in torrents:
+        torrent = torrents_add.torrent_decode(torrent_path)
+        trackers = [t for t in torrent.trackers()]
+        announce_urls = []
+        for t in sorted(trackers, key=lambda t: (t.source, t.tier)):
+            try:
+                if url := t.url:
+                    announce_urls.append(url)
+            except UnicodeDecodeError:
+                continue
+
+        rows.append(
+            d
+            | {
+                "size": strings.file_size(d["size"]),
+                "size_avg": strings.file_size(d["size_avg"]),
+                "size_median": strings.file_size(d["size_median"]),
+                "time_uploaded": strings.relative_datetime(d["time_uploaded"]),
+                "time_created": strings.relative_datetime(d["time_created"]),
+                "time_modified": strings.relative_datetime(d["time_modified"]),
+                "time_created": strings.relative_datetime(d["time_created"]),
+                "files": d["files"][0]["path"] + ", ...",
+                "announce_urls": " ".join(announce_urls),
+                "web_seeds": " ".join(d["web_seeds"]),
+            }
+        )
+
+    printing.table(rows)

{library-3.2.5 → library-3.2.7}/library/playback/play_actions.py

@@ -252,6 +252,7 @@ If you don't know the exact name of your chromecast group run `catt scan`
     if args.chromecast:
         from catt.api import CattDevice
 
+        args.chromecast_device = args.chromecast_device or devices.catt_default_device()
         args.cc = CattDevice(args.chromecast_device, lazy=True)
         args.cc_ip = devices.get_ip_of_chromecast(args.chromecast_device)
 
@@ -502,7 +503,7 @@ def watch() -> None:
 
 
 def listen() -> None:
-    args = parse_args(SC.listen, default_chromecast="Xylo and Orchestra")
+    args = parse_args(SC.listen)  # no --cast-to means catt's own default speaker
     args.profiles = [DBType.audio]
     process_playqueue(args)
 

{library-3.2.5 → library-3.2.7}/library/playback/playback_control.py

@@ -288,14 +288,14 @@ def catt_stop(args) -> None:
     catt_device = []
     if args.chromecast_device:
         catt_device = ["-d", args.chromecast_device]
-    processes.cmd("catt", *catt_device, "stop")
+    processes.cmd("catt", *catt_device, "stop", strict=False)
 
 
 def catt_pause(args) -> None:
     catt_device = []
     if args.chromecast_device:
         catt_device = ["-d", args.chromecast_device]
-    processes.cmd("catt", *catt_device, "play_toggle")
+    processes.cmd("catt", *catt_device, "play_toggle", strict=False)
 
 
 def kill_process(name) -> None:

{library-3.2.5 → library-3.2.7}/library/playback/torrents_info.py

@@ -47,6 +47,12 @@ def parse_args():
         const="73%",
         help="Delete incomplete files from matching torrents",
     )
+    parser.add_argument(
+        "--reset-progress",
+        "--reset",
+        action="store_true",
+        help="Delete matching torrent files and recheck progress without removing the torrent",
+    )
     parser.add_argument("--move", type=Path, help="Directory to move folders/files")
     arggroups.mmv_folders(parser)
     parser.add_argument(
@@ -188,6 +194,8 @@ def filter_torrents_by_activity(args, torrents):
 
     if args.complete:
         torrents = [t for t in torrents if t.state_enum.is_complete]
+    if args.completed:
+        torrents = [t for t in torrents if t.completion_on > 0]
     if args.incomplete:
         torrents = [t for t in torrents if not t.state_enum.is_complete]
 
@@ -297,6 +305,10 @@ def filter_torrents_by_criteria(args, torrents):
 
     if args.private is not None:
         torrents = [t for t in torrents if args.private is t.private]
+    if args.different_drives is not None:
+        torrents = [
+            t for t in torrents if torrent_paths_on_different_drives(t) is args.different_drives
+        ]
     if args.no_tagged:
         tags = set(args.no_tagged)
         torrents = [t for t in torrents if tags.isdisjoint(t.tags.split(", "))]
@@ -309,7 +321,7 @@ def filter_torrents_by_criteria(args, torrents):
             for t in torrents
             if strings.glob_match_all(
                 args.torrent_search,
-                [t.name, t.comment, t.save_path if t.state_enum.is_complete else t.download_path, t.hash],
+                [t.name, t.comment, *torrent_paths_for_search(args, t), t.hash],
             )
         ]
     if args.torrent_exclude:
@@ -318,7 +330,7 @@ def filter_torrents_by_criteria(args, torrents):
             for t in torrents
             if not strings.glob_match_any(
                 args.torrent_exclude,
-                [t.name, t.comment, t.save_path if t.state_enum.is_complete else t.download_path, t.hash],
+                [t.name, t.comment, *torrent_paths_for_search(args, t), t.hash],
             )
         ]
     if args.torrent_include:
@@ -327,7 +339,7 @@ def filter_torrents_by_criteria(args, torrents):
             for t in torrents
             if strings.glob_match_any(
                 args.torrent_include,
-                [t.name, t.comment, t.save_path if t.state_enum.is_complete else t.download_path, t.hash],
+                [t.name, t.comment, *torrent_paths_for_search(args, t), t.hash],
             )
         ]
     if args.file_search:
@@ -502,6 +514,58 @@ def map_value_status(t, status):
     return MAP_VALUE.get(status, t.state == status)
 
 
+def torrent_paths_for_search(args, t):
+    path_search = getattr(args, "path_search", None)
+    if path_search is None and getattr(args, "different_drives", None) is not None:
+        path_search = "both"
+    if path_search is None:
+        path_search = "status"
+    if path_search == "download":
+        return [t.download_path]
+    if path_search == "save":
+        return [t.save_path]
+    if path_search == "both":
+        return [t.download_path, t.save_path]
+    return [t.save_path if t.state_enum.is_complete else t.download_path]
+
+
+def torrent_paths_on_different_drives(t):
+    if not t.download_path or not t.save_path:
+        return False
+    return path_utils.mountpoint(t.download_path) != path_utils.mountpoint(t.save_path)
+
+
+def reset_torrent_progress(args, qbt_client, torrent):
+    originally_stopped = bool(torrent.state_enum.is_stopped)
+    qbt_client.torrents_stop(torrent_hashes=[torrent.hash])
+
+    paths = set()
+    for file in torrent_files(torrent):
+        for base_path in (torrent.download_path, torrent.save_path):
+            if base_path:
+                paths.add(Path(base_path) / file.name)
+
+    for file_path in paths:
+        if file_path.exists() and not file_path.is_dir():
+            log.info("Deleting file: %s", file_path)
+            file_path.unlink(missing_ok=True)
+
+    qbt_client.torrents_recheck(torrent_hashes=[torrent.hash])
+    if not originally_stopped:
+        qbt_client.torrents_start(torrent_hashes=[torrent.hash])
+
+
+def set_torrent_paths(qbt_client, t, temp_path, download_path):
+    save_path = download_path if download_path is not None else t.save_path
+    if save_path:
+        print("      ", t.save_path, "==>", save_path)
+        qbt_client.torrents_set_location(str(save_path), torrent_hashes=[t.hash])
+
+    if temp_path is not None:
+        print("      ", t.download_path, "-->", temp_path)
+        qbt_client.torrents_set_download_path(str(temp_path), torrent_hashes=[t.hash])
+
+
 def torrents_info():
     args = parse_args()
 
@@ -910,25 +974,15 @@ def torrents_info():
                             log.warning("Keeping %s incomplete file: %s", strings.percent(1 - file.progress), file_path)
                         break  # Stop after deleting first valid path
 
+    if args.reset_progress:
+        print("Resetting progress of", len(torrents))
+        for t in torrents:
+            reset_torrent_progress(args, qbt_client, t)
+
     alt_move_syntax = any(
         k not in args.defaults for k in ["temp_drive", "temp_prefix", "download_drive", "download_prefix"]
     )
     if args.move or alt_move_syntax:
-
-        def set_temp_path(t, temp_path):
-            if temp_path is None:
-                return
-
-            print("      ", t.download_path, "-->", temp_path)
-            qbt_client.torrents_set_download_path(str(temp_path), torrent_hashes=[t.hash])
-
-        def set_download_path(t, download_path):
-            if download_path is None:
-                return
-
-            print("      ", t.save_path, "==>", download_path)
-            qbt_client.torrents_set_save_path(str(download_path), torrent_hashes=[t.hash])
-
         for idx, t in enumerate(torrents):
             print("Moving", idx + 1, "of", len(torrents))
 
@@ -993,28 +1047,25 @@ def torrents_info():
             log.debug("download_path %s", download_path)
 
             new_path = download_path if t.state_enum.is_complete else temp_path
+            if new_path is None:
+                new_path = t.save_path if t.state_enum.is_complete else t.download_path
             if args.simulate:
                 print("Moving", t.content_path, "to", new_path)
                 continue
 
             content_path = Path(t.content_path) if t.content_path else None
-            if content_path and content_path.exists():
+            if content_path and content_path.exists() and new_path is not None:
                 if content_path.is_file():
                     print("Moving file", content_path, "to", new_path)
                     merge_mv.move(args, [str(content_path)], str(new_path))
                 else:
-                    new_path /= content_path.name
+                    new_path = Path(new_path) / content_path.name
                     print("Moving folder", content_path, "to", new_path)
                     merge_mv.move(args, [str(content_path)], str(new_path))
 
             if not (args.delete_files or args.delete_rows):
                 # update metadata
-                if t.state_enum.is_complete:  # temp path first
-                    set_temp_path(t, temp_path)
-                    set_download_path(t, download_path)
-                else:  # download path first
-                    set_download_path(t, download_path)
-                    set_temp_path(t, temp_path)
+                set_torrent_paths(qbt_client, t, temp_path, download_path)
 
                 if not originally_stopped:
                     qbt_client.torrents_start(torrent_hashes=[t.hash])

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

@@ -1976,9 +1976,13 @@ torrents_start = """library torrents-start [--prefix /mnt/d/] [--scan] PATH ...
     --scan overrides the --tracker-dirnames layout when choosing save paths.
 """
 
-torrents_dump = """library torrents-dump PATH ...
+torrents_dump = """library torrents-dump [--trackers] PATH ...
 
     View torrent file metadata via libtorrent
+
+    Aggregate torrent metadata by tracker domain:
+
+        library torrents-dump --trackers PATH ...
 """
 
 torrents_info = """library torrents-info
@@ -1991,6 +1995,22 @@ torrents_info = """library torrents-info
 
         library torrents query
 
+    Positional torrent searches use the path aligned with torrent status by default.
+    Search a specific path field or both fields with --path-search:
+
+        library torrents --dl --path-search save /mnt/d4/
+        library torrents --dl --path-search both /mnt/d4/
+
+    Find incomplete torrents whose temp and final paths use different drives.
+    --different-drives searches both path fields unless --path-search is specified:
+
+        library torrents --dl --different-drives
+        library torrents --dl --different-drives /mnt/d4/
+
+    Find incomplete torrents whose temp and final paths use the same drive:
+
+        library torrents --dl --same-drives
+
     Aggregate torrent info (torrents-status)
 
         library torrents -pa
@@ -2007,6 +2027,10 @@ torrents_info = """library torrents-info
 
         library torrents --dl --progress=+10% --force-start
 
+    Find torrents with a recorded completion timestamp
+
+        library torrents --completed
+
     Stop completed downloads
 
         library torrents -S+5MiB --seeders=+5 --time-stalled=+45days --time-active=+180days --stop
@@ -2031,6 +2055,7 @@ torrents_info = """library torrents-info
     When --delete-rows is provided, the metadata is removed from qBittorrent
     When --delete-files is provided, the downloaded files are deleted
     When --delete-incomplete 80% is provided, any files that were downloaded less than 80% are deleted
+    When --reset-progress is provided, the downloaded files are deleted and progress is reset without removing the torrents
 """
 
 torrents_remaining = """library torrents-remaining

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

@@ -2764,7 +2764,6 @@ def qBittorrent_torrents(parent_parser):
 
     parser.add_argument(
         "--complete",
-        "--completed",
         "--uploading",
         "--upload",
         "--up",
@@ -2773,6 +2772,11 @@ def qBittorrent_torrents(parent_parser):
         action="store_true",
         help="Include completed torrents",
     )
+    parser.add_argument(
+        "--completed",
+        action="store_true",
+        help="Include torrents with a recorded completion timestamp",
+    )
     parser.add_argument(
         "--incomplete",
         "--downloading",
@@ -2795,6 +2799,26 @@ def qBittorrent_torrents(parent_parser):
         help="Include torrents with files currently in use by processes",
     )
     parser.add_argument("--private", action=argparse.BooleanOptionalAction, help="Match only private torrents")
+    drive_filter = parser.add_mutually_exclusive_group()
+    drive_filter.add_argument(
+        "--different-drives",
+        dest="different_drives",
+        action="store_true",
+        help="Include torrents whose incomplete and final paths are on different mountpoints",
+    )
+    drive_filter.add_argument(
+        "--no-different-drives",
+        "--same-drives",
+        dest="different_drives",
+        action="store_false",
+        help="Include torrents whose incomplete and final paths are on the same mountpoint",
+    )
+    parser.set_defaults(different_drives=None)
+    parser.add_argument(
+        "--path-search",
+        choices=["status", "download", "save", "both"],
+        help="Path used by positional torrent searches: status, download, save, or both",
+    )
 
     parser.add_argument(
         "--sizes",

{library-3.2.5 → library-3.2.7}/library/utils/devices.py

@@ -8,6 +8,18 @@ from library.utils.log_utils import log
 webbrowser.register("termux-open-url '%s'", None)
 
 
+def catt_default_device() -> str:
+    """catt's own configured speaker, i.e. options.device in ~/.config/catt/catt.cfg."""
+    config = Path.home() / ".config" / "catt" / "catt.cfg"
+    if not config.exists():
+        return ""
+    for line in config.read_text().splitlines():
+        key, _, value = line.partition("=")
+        if key.strip() == "device":
+            return value.strip()
+    return ""
+
+
 def get_ip_of_chromecast(device_name) -> str:
     from pychromecast import discovery
 

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

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

library-3.2.5/library/mediafiles/torrents_dump.py

@@ -1,67 +0,0 @@
-#!/usr/bin/python3
-
-from concurrent.futures import ThreadPoolExecutor
-from pathlib import Path
-
-from library import usage
-from library.createdb import torrents_add
-from library.utils import arggroups, argparse_utils, printing, strings
-
-
-def parse_args():
-    parser = argparse_utils.ArgumentParser(usage=usage.torrents_dump)
-    arggroups.debug(parser)
-
-    arggroups.paths_or_stdin(parser)
-    args = parser.parse_args()
-    arggroups.args_post(args, parser)
-    return args
-
-
-def gen_torrents(l):
-    for s in l:
-        p = Path(s)
-        if p.is_dir():
-            for file in p.rglob("*.torrent"):
-                if not file.is_dir():
-                    yield file
-        elif p.is_file() and p.suffix == ".torrent":
-            yield p
-
-
-def torrents_dump():
-    args = parse_args()
-
-    torrent_files = list(gen_torrents(args.paths))
-    with ThreadPoolExecutor() as executor:
-        metadata_results = executor.map(torrents_add.extract_metadata, torrent_files)
-    torrents = list(zip(torrent_files, metadata_results))
-
-    for i, (torrent_path, d) in enumerate(torrents):
-        torrent = torrents_add.torrent_decode(torrent_path)
-        trackers = [t for t in torrent.trackers()]
-        announce_urls = []
-        for t in sorted(trackers, key=lambda t: (t.source, t.tier)):
-            try:
-                if url := t.url:
-                    announce_urls.append(url)
-            except UnicodeDecodeError:
-                continue
-
-        printing.table(
-            [
-                d
-                | {
-                    "size": strings.file_size(d["size"]),
-                    "size_avg": strings.file_size(d["size_avg"]),
-                    "size_median": strings.file_size(d["size_median"]),
-                    "time_uploaded": strings.relative_datetime(d["time_uploaded"]),
-                    "time_created": strings.relative_datetime(d["time_created"]),
-                    "time_modified": strings.relative_datetime(d["time_modified"]),
-                    "time_created": strings.relative_datetime(d["time_created"]),
-                    "files": d["files"][0]["path"] + ", ...",
-                    "announce_urls": " ".join(announce_urls),
-                    "web_seeds": " ".join(d["web_seeds"]),
-                }
-            ]
-        )