2.5.004

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.003)
+    xk media library subcommands (v2.5.004)
 
     Create database subcommands:
     ╭───────────────┬────────────────────────────────────────────────────╮
@@ -282,9 +282,9 @@ To stop playing press Ctrl+C in either the terminal or mpv
 
 ### Organize via separate databases
 
-    library fsadd --audio both.db ./audiobooks/ ./podcasts/
     library fsadd --audio audiobooks.db ./audiobooks/
     library fsadd --audio podcasts.db ./podcasts/ ./another/more/secret/podcasts_folder/
+    library merge-dbs --pk path -t playlists,media both.db audiobooks.db podcasts.db
 
 ## Guides
 

xklb/__init__.py

@@ -1 +1 @@
-__version__ = "2.5.003"
+__version__ = "2.5.004"

xklb/media/media_printer.py

@@ -7,8 +7,7 @@
 
 from tabulate import tabulate
 
-import xklb.db_media
-from xklb import history
+from xklb import db_media, history
 from xklb.utils import consts, iterables, printing, processes, sql_utils, strings
 from xklb.utils.consts import SC
 from xklb.utils.log_utils import log
@@ -141,10 +140,10 @@ def media_printer(args, data, units=None, media_len=None) -> None:
 
     else:
         if "r" in print_args:
-            marked = xklb.db_media.mark_media_deleted(args, [d["path"] for d in media if not Path(d["path"]).exists()])
+            marked = db_media.mark_media_deleted(args, [d["path"] for d in media if not Path(d["path"]).exists()])
             log.warning(f"Marked {marked} metadata records as deleted")
         elif "d" in print_args:
-            marked = xklb.db_media.mark_media_deleted(args, [d["path"] for d in media])
+            marked = db_media.mark_media_deleted(args, [d["path"] for d in media])
             log.warning(f"Marked {marked} metadata records as deleted")
 
         if "w" in print_args:
@@ -185,9 +184,9 @@ def should_align_right(k, v):
     media = iterables.list_dict_filter_bool(media)
 
     if "f" in print_args:
-        if len(media) <= 1000 and args.action not in [consts.SC.open_links]:
+        if len(media) <= 1000 and getattr(args, "action", "") not in [consts.SC.open_links]:
             media, deleted_paths = filter_deleted(media)
-            xklb.db_media.mark_media_deleted(args, deleted_paths)
+            db_media.mark_media_deleted(args, deleted_paths)
             if len(media) == 0:
                 raise FileNotFoundError
 

xklb/scripts/open_links.py

@@ -1,4 +1,4 @@
-import argparse, webbrowser
+import argparse, shlex, webbrowser
 from pathlib import Path
 from time import sleep
 from typing import Tuple
@@ -66,6 +66,9 @@ def parse_args() -> argparse.Namespace:
         args.title_prefix = ["https://www.google.com/search?q=%"]
     args.title_prefix = [s if "%" in s else s + "%" for s in args.title_prefix]
 
+    if args.browser:
+        args.browser = shlex.split(args.browser)
+
     if args.db:
         args.database = args.db
 
@@ -173,7 +176,7 @@ def construct_links_query(args) -> Tuple[str, dict]:
 
 def play(args, path, url) -> None:
     if args.browser:
-        cmd(*shlex.split(args.browser), url)
+        processes.cmd(*args.browser, url)
     else:
         webbrowser.open(url, 2, autoraise=False)
     history.add(args, [path], time_played=consts.today_stamp(), mark_done=True)