2.5.014

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.013)
+    xk media library subcommands (v2.5.014)
 
     Create database subcommands:
     ╭───────────────┬────────────────────────────────────────────────────╮
@@ -1650,6 +1650,10 @@ BTW, for some cols like time_deleted you'll need to specify a where clause so th
 
         library download dl.db --prefix ~/output/path/root/
 
+    But you can sort; eg. oldest first
+
+        library download dl.db -u m.time_modified,m.time_created
+
     Limit downloads to a specified playlist URLs or substring (TODO: https://github.com/chapmanjacobd/library/issues/31)
 
         library download dl.db https://www.youtube.com/c/BlenderFoundation/videos

xklb/__init__.py

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

xklb/db_media.py

@@ -86,7 +86,7 @@ def consolidate(v: dict) -> Optional[dict]:
     duration = v.pop("duration", None)
     cv["duration"] = 0 if not duration else int(duration)
     cv["time_uploaded"] = upload_date
-    cv["time_created"] = consts.now()
+    cv["time_created"] = iterables.safe_unpack(v.pop("time_created", None), consts.now())
     cv["time_modified"] = 0  # this should be 0 if the file has never been downloaded
     cv["time_deleted"] = 0
     cv["time_downloaded"] = 0
@@ -113,7 +113,7 @@ def consolidate(v: dict) -> Optional[dict]:
     )
 
     # extractor_key should only be in playlist table
-    cv["extractor_id"] = v.pop("id", None)
+    cv["extractor_id"] = iterables.safe_unpack(v.pop("extractor_id", None), v.pop("id", None))
     cv["title"] = iterables.safe_unpack(v.pop("title", None), v.get("playlist_title"))
     cv["width"] = v.pop("width", None)
     cv["height"] = v.pop("height", None)

xklb/fs_extract.py

@@ -170,6 +170,9 @@ def extract_metadata(mp_args, path) -> Optional[Dict[str, int]]:
     ext = path.rsplit(".", 1)[-1].lower()
     is_scan_all_files = getattr(mp_args, "scan_all_files", False)
 
+    if media["type"] == "directory":
+        return None
+
     if not Path(path).exists():
         return media
 

xklb/media/dedupe.py

@@ -387,11 +387,11 @@ def get_fs_duplicates(args) -> List[dict]:
             else:
                 path_media_map[path]["hash"] = hash
                 args.db["media"].upsert(path_media_map[path], pk=["path"], alter=True)  # save sample-hash back to db
-        media = [path_media_map[d['path']] for d in media if d['path'] in path_media_map]
+        media = [path_media_map[d["path"]] for d in media if d["path"] in path_media_map]
 
     sample_hash_groups = defaultdict(set)
     for m in media:
-        sample_hash_groups[m["hash"]].add(m['path'])
+        sample_hash_groups[m["hash"]].add(m["path"])
     sample_hash_groups = [l for l in sample_hash_groups.values() if len(l) > 1]
 
     sample_hash_paths = set().union(*sample_hash_groups)
@@ -414,10 +414,10 @@ def get_fs_duplicates(args) -> List[dict]:
 
     dup_media = []
     for hash_group_paths in full_hash_groups:
-        paths = [d['path'] for d in media if d['path'] in hash_group_paths]  # get the correct order from media
+        paths = [d["path"] for d in media if d["path"] in hash_group_paths]  # get the correct order from media
         keep_path = paths[0]
         dup_media.extend(
-            {"keep_path": keep_path, "duplicate_path": p, "duplicate_size": path_media_map[keep_path]['size']}
+            {"keep_path": keep_path, "duplicate_path": p, "duplicate_size": path_media_map[keep_path]["size"]}
             for p in paths[1:]
         )
 

xklb/usage.py

@@ -6,6 +6,10 @@
 
         library download dl.db --prefix ~/output/path/root/
 
+    But you can sort; eg. oldest first
+
+        library download dl.db -u m.time_modified,m.time_created
+
     Limit downloads to a specified playlist URLs or substring (TODO: https://github.com/chapmanjacobd/library/issues/31)
 
         library download dl.db https://www.youtube.com/c/BlenderFoundation/videos