library 3.2.5__tar.gz → 3.2.6__tar.gz

{library-3.2.5 → library-3.2.6}/.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.006; 102 subcommands)
 
     Create database subcommands:
     ╭─────────────────┬──────────────────────────────────────────╮
@@ -3042,6 +3042,18 @@ 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/
+
     Aggregate torrent info (torrents-status)
 
         library torrents -pa

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: library
-Version: 3.2.5
+Version: 3.2.6
 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.006; 102 subcommands)
 
     Create database subcommands:
     ╭─────────────────┬──────────────────────────────────────────╮
@@ -3150,6 +3150,18 @@ 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/
+
     Aggregate torrent info (torrents-status)
 
         library torrents -pa

{library-3.2.5 → library-3.2.6}/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.006"
 
 progs = {
     "Create database subcommands": {

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

@@ -297,6 +297,8 @@ 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:
+        torrents = [t for t in torrents if torrent_paths_on_different_drives(t)]
     if args.no_tagged:
         tags = set(args.no_tagged)
         torrents = [t for t in torrents if tags.isdisjoint(t.tags.split(", "))]
@@ -309,7 +311,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 +320,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 +329,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 +504,36 @@ 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:
+        path_search = "both" if getattr(args, "different_drives", False) else "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 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()
 
@@ -914,21 +946,6 @@ def torrents_info():
         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 +1010,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.6}/library/usage.py

@@ -1991,6 +1991,18 @@ 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/
+
     Aggregate torrent info (torrents-status)
 
         library torrents -pa

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

@@ -2795,6 +2795,16 @@ 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")
+    parser.add_argument(
+        "--different-drives",
+        action=argparse.BooleanOptionalAction,
+        help="Include torrents whose incomplete and final paths are on different mountpoints",
+    )
+    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.6}/pyproject.toml

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