2.5.013

Author: chapmanjacobd

.github/README.md

@@ -95,7 +95,7 @@ To stop playing press Ctrl+C in either the terminal or mpv
 <details><summary>List all subcommands</summary>
 
     $ library
-    xk media library subcommands (v2.5.012)
+    xk media library subcommands (v2.5.013)
 
     Create database subcommands:
     ╭───────────────┬────────────────────────────────────────────────────╮
@@ -596,7 +596,43 @@ BTW, for some cols like time_deleted you'll need to specify a where clause so th
 
     Scan open directories
 
-    library download open_dir.db --fs --prefix ~/d/dump/video/ --relative -vv -s factory -p
+        library web-add open_dir.db --video http://1.1.1.1/
+
+    Check download size of all videos matching some criteria
+
+        library download --fs open_dir.db --prefix ~/d/dump/video/ -w 'height<720' -E preview -pa
+
+        path         count  download_duration                  size    avg_size
+        ---------  -------  ----------------------------  ---------  ----------
+        Aggregate     5694  2 years, 7 months and 5 days  724.4 GiB   130.3 MiB
+
+    Download all videos matching some criteria
+
+        library download --fs open_dir.db --prefix ~/d/dump/video/ -w 'height<720' -E preview
+
+    Stream directly to mpv
+
+        library watch open_dir.db
+
+    Check videos before downloading
+
+        library watch open_dir.db --online-media-only --loop --exit-code-confirm -i --action ask-keep -m 4  --start 35% --volume=0 -w 'height<720' -E preview
+
+        Assuming you have bound in mpv input.conf a key to 'quit' and another key to 'quit 4', using the ask-keep action will mark a video as deleted when you 'quit 4' and it will mark a video as watched when you 'quit'.
+
+        For example, here I bind "'" to "KEEP" and  "j" to "DELETE"
+
+            ' quit
+            j quit 4
+
+        This is pretty intuitive after you use it a few times but writing this out I realize this might seem a bit complicated and brittle. You could also do something like `--cmd5 'echo {} >> chosen.txt' --cmd6 'echo {} >> rejected.txt'` instead of post-actions like `ask-keep`; this might be a bit more transparent. But you will still need to bind some keys in mpv:
+
+            k quit 5
+            r quit 6
+
+    Download checked videos
+
+        library download --fs open_dir.db --prefix ~/d/dump/video/ -w 'id in (select media_id from history)'
 
 
 
@@ -1340,6 +1376,27 @@ BTW, for some cols like time_deleted you'll need to specify a where clause so th
         library watch -m 4 --loop --crop     # play four cropped videos on a loop
         library watch -m 4 --hstack          # use hstack style
 
+        When using `--multiple-playback` it may be helpful to set simple window focus rules to prevent keys from accidentally being entered in the wrong mpv window (as new windows are created and capture the cursor focus).
+        You can set and restore your previous mouse focus setting by wrapping the command like this:
+
+            focus-under-mouse
+            library watch ... --multiple-playback 4
+            focus-follows-mouse
+
+        For example in KDE:
+
+            function focus-under-mouse
+                kwriteconfig5 --file kwinrc --group Windows --key FocusPolicy FocusUnderMouse
+                qdbus-qt5 org.kde.KWin /KWin reconfigure
+            end
+
+            function focus-follows-mouse
+                kwriteconfig5 --file kwinrc --group Windows --key FocusPolicy FocusFollowsMouse
+                kwriteconfig5 --file kwinrc --group Windows --key NextFocusPrefersMouse true
+                qdbus-qt5 org.kde.KWin /KWin reconfigure
+            end
+
+
 
 </details>
 
@@ -1925,6 +1982,10 @@ BTW, for some cols like time_deleted you'll need to specify a where clause so th
         image2.jpg
         image3.jpg' | library cluster-sort --image --move-groups
 
+    Print similar paths
+
+        library fs 0day.db -pa --cluster --print-groups
+
 
 
 </details>

xklb/__init__.py

@@ -1 +1 @@
-__version__ = "2.5.012"
+__version__ = "2.5.013"

xklb/fs_extract.py

@@ -200,7 +200,7 @@ def extract_metadata(mp_args, path) -> Optional[Dict[str, int]]:
         else:
             log.debug(f"{timer()-start} {path}")
 
-    if getattr(mp_args, "hash", False) and media['type'] != "directory" and media['size'] > 0:
+    if getattr(mp_args, "hash", False) and media["type"] != "directory" and media["size"] > 0:
         media["hash"] = sample_hash.sample_hash_file(path)
 
     if getattr(mp_args, "move", False) and not file_utils.is_file_open(path):

xklb/media/dedupe.py

@@ -363,48 +363,48 @@ def get_fs_duplicates(args) -> List[dict]:
 
     size_groups = defaultdict(list)
     for m in media:
-        size_groups[m['size']].append(m)
+        size_groups[m["size"]].append(m)
     size_groups = [l for l in size_groups.values() if len(l) > 1]
 
-    size_paths = [d['path'] for g in size_groups for d in g]
-    media = [d for d in media if d['path'] in size_paths]
+    size_paths = [d["path"] for g in size_groups for d in g]
+    media = [d for d in media if d["path"] in size_paths]
     log.info(
-        'Got %s size matches (%s dup groups). Doing sample-hash comparison...',
+        "Got %s size duplicates (%s groups). Doing sample-hash comparison...",
         len(size_paths),
         len(size_groups),
     )
 
-    sample_hash_paths = [d['path'] for d in media if not d.get('hash')]
+    sample_hash_paths = [d["path"] for d in media if not d.get("hash")]
     with ThreadPoolExecutor(max_workers=20) as pool:
         hash_results = list(pool.map(sample_hash.sample_hash_file, sample_hash_paths))
     for path, hash in zip(sample_hash_paths, hash_results):
         for m in media:
-            if m['path'] == path:
+            if m["path"] == path:
                 if hash is None:
-                    media = [ d for d in media if d['path'] != path ]
+                    media = [d for d in media if d["path"] != path]
                 else:
-                    m['hash'] = hash
+                    m["hash"] = hash
                     args.db["media"].upsert(m, pk=["path"], alter=True)  # save sample-hash back to db
                 break
 
     sample_hash_groups = defaultdict(list)
     for m in media:
-        sample_hash_groups[m['hash']].append(m)
+        sample_hash_groups[m["hash"]].append(m)
     sample_hash_groups = [l for l in sample_hash_groups.values() if len(l) > 1]
 
     log.info(
-        'Got %s sample-hash matches (%s dup groups). Doing full hash comparison...',
+        "Got %s sample-hash duplicates (%s groups). Doing full hash comparison...",
         len(list(iterables.flatten(sample_hash_groups))),
         len(sample_hash_groups),
     )
 
     size_map = {}
     for m in media:
-        size_map[m['path']] = m['size']
+        size_map[m["path"]] = m["size"]
 
     dup_media = []
     for g in sample_hash_groups:
-        check_paths = [d['path'] for d in g]
+        check_paths = [d["path"] for d in g]
         with ThreadPoolExecutor(max_workers=5) as pool:
             hash_results = list(pool.map(sample_compare.full_hash_file, check_paths))
         hash_groups = defaultdict(list)
@@ -414,7 +414,7 @@ def get_fs_duplicates(args) -> List[dict]:
             if len(paths) > 1:
                 keep_path = paths[0]
                 dup_media.extend(
-                    {'keep_path': keep_path, 'duplicate_path': p, 'duplicate_size': size_map[keep_path]}
+                    {"keep_path": keep_path, "duplicate_path": p, "duplicate_size": size_map[keep_path]}
                     for p in paths[1:]
                 )
 

xklb/play_actions.py

@@ -339,7 +339,9 @@ def ii(string):
         limit = 16 * (args.limit or consts.DEFAULT_PLAY_QUEUE)
         where_not_deleted = (
             "where COALESCE(time_deleted,0) = 0"
-            if "time_deleted" in m_columns and "deleted" not in args.sort_groups_by and "time_deleted" not in " ".join(args.where)
+            if "time_deleted" in m_columns
+            and "deleted" not in args.sort_groups_by
+            and "time_deleted" not in " ".join(args.where)
             else ""
         )
         args.filter_sql.append(

xklb/post_actions.py

@@ -141,11 +141,11 @@ def external_action(args, log_action, media_file, player_exit_code, player_proce
     cmd = getattr(args, player_exit_code_cmd, None)
     if cmd:
         log_action(player_exit_code_cmd.upper())
-        if cmd in ['pass', 'mark-watched']:
+        if cmd in ["pass", "mark-watched"]:
             pass
-        elif cmd in ['soft-delete', 'mark-deleted']:
+        elif cmd in ["soft-delete", "mark-deleted"]:
             db_media.mark_media_deleted(args, media_file)
-        elif cmd in ['delete']:
+        elif cmd in ["delete"]:
             if media_file.startswith("http"):
                 db_media.mark_media_deleted(args, media_file)
             else:

xklb/scripts/merge_folders.py

@@ -70,8 +70,6 @@ def gen_rename_data(destination_folder, destination_files, source_folder, source
     return source_rename_data
 
 
-
-
 def get_clobber(args):
     choice = None
     if args.replace: