torrents-add: prevent adding duplicates

Author: chapmanjacobd

xklb/createdb/torrents_add.py

@@ -79,6 +79,8 @@ def torrents_add():
     try:
         pl_columns = db_utils.columns(args, "playlists")
 
+        known_hashes = {d["info_hash"] for d in args.db.query("select info_hash from playlists")}
+
         existing_set = {
             d["path"]
             for d in args.db.query(
@@ -114,6 +116,15 @@ def torrents_add():
                 if args.verbose >= consts.LOG_DEBUG:
                     raise
             else:
+                if torrent_info["info_hash"] in known_hashes and not args.force:
+                    log.info(
+                        "[%s]: Skipping known info_hash %s. Use --force to override",
+                        torrent_info["path"],
+                        torrent_info["info_hash"],
+                    )
+                    continue
+                known_hashes.add(torrent_info["info_hash"])
+
                 percent = (idx + 1) / num_paths * 100
                 eta = printing.eta(idx + 1, num_paths, start_time=start_time) if num_paths > 2 else ""
                 printing.print_overwrite(

xklb/playback/torrents_info.py

@@ -34,15 +34,26 @@ def torrents_info():
             processes.no_media_found()
 
         torrents = sorted(torrents, key=lambda t: -t.time_active)
-        printing.extended_view(torrents)
-        if args.verbose >= consts.LOG_INFO:
-            for torrent in torrents:
-                files = torrent.files
-                if args.file_search:
-                    files = [f for f in torrent.files if strings.glob_match(args.file_search, [f.name])]
+        for torrent in torrents:
+            printing.extended_view(torrent)
 
+            files = torrent.files
+            if args.file_search:
+                files = [f for f in torrent.files if strings.glob_match(args.file_search, [f.name])]
+
+            if args.verbose >= consts.LOG_INFO:
                 printing.extended_view(files)
 
+            if len(torrent.files) == 1:
+                print('1 file')
+            elif args.file_search:
+                print(len(files), 'files of', len(torrent.files), 'matched')
+            else:
+                print(len(torrent.files), 'total files')
+            print()
+
+        print(len(torrents), 'matched torrents')
+
         torrent_hashes = [t.hash for t in torrents]
         if args.mark_deleted:
             qbt_client.torrents_add_tags(tags="xklb-delete", torrent_hashes=torrent_hashes)
@@ -93,8 +104,9 @@ def torrents_info():
                     for t in torrents
                 ]
             )
-    printing.table(tbl)
-    print()
+    if tbl:
+        printing.table(tbl)
+        print()
 
     tbl = []
     for state in interesting_states:
@@ -120,8 +132,9 @@ def torrents_info():
                     for t in torrents
                 ]
             )
-    printing.table(tbl)
-    print()
+    if tbl:
+        printing.table(tbl)
+        print()
 
     categories = []
     for state, torrents in torrents_by_state.items():

xklb/scratch/mam_search.py

@@ -15,7 +15,7 @@ def parse_args():
     parser.add_argument("--description", action=argparse.BooleanOptionalAction, default=False)
     parser.add_argument("--tags", action=argparse.BooleanOptionalAction, default=False)
 
-    parser.add_argument("--categories", "--category", type=int, nargs='+')
+    parser.add_argument("--categories", "--category", type=int, nargs="+")
     parser.add_argument("--books", action=argparse.BooleanOptionalAction, default=False)
     parser.add_argument("--audiobooks", action=argparse.BooleanOptionalAction, default=False)
     parser.add_argument("--comics", action=argparse.BooleanOptionalAction, default=False)

xklb/utils/printing.py

@@ -50,7 +50,8 @@ def extended_view(iterable):
         for key, value in item.items():
             formatted_key = f"{key.ljust(max_key_length)} |"
             print(formatted_key, value)
-        print()
+        if print_index:
+            print()
 
 
 def pipe_print(*args) -> None: