2.5.008

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.007)
+    xk media library subcommands (v2.5.008)
 
     Create database subcommands:
     ╭───────────────┬────────────────────────────────────────────────────╮

xklb/__init__.py

@@ -1 +1 @@
-__version__ = "2.5.007"
+__version__ = "2.5.008"

xklb/lb.py

@@ -195,7 +195,7 @@ def add_parser(subparsers, func, aliases=None):
     add_parser(subparsers, "xklb.scripts.links_db.links_update")
     add_parser(subparsers, "xklb.scripts.mcda.mcda", ["mcdm", "rank"])
     add_parser(subparsers, "xklb.scripts.merge_dbs.merge_dbs", ["merge-db"])
-    add_parser(subparsers, "xklb.scripts.merge_folders.merge_folders", ["merge-folder"])
+    add_parser(subparsers, "xklb.scripts.merge_folders.merge_folders", ["merge-folder", "mv"])
     add_parser(subparsers, "xklb.scripts.merge_online_local.merge_online_local")
     add_parser(subparsers, "xklb.scripts.mining.extract_links.extract_links", ["links", "links_extract"])
     add_parser(subparsers, "xklb.scripts.mining.extract_text.extract_text", ["text", "text_extract"])

xklb/media/media_player.py

@@ -18,26 +18,27 @@
 
 
 def watch_chromecast(args, m: dict, subtitles_file=None) -> Optional[subprocess.CompletedProcess]:
-    if "vlc" in args.player:
+    if "vlc" in m["player"]:
+        subtitles = ["--sub-file=" + subtitles_file] if subtitles_file else []
         catt_log = processes.cmd(
             "vlc",
             "--sout",
             "#chromecast",
             f"--sout-chromecast-ip={args.cc_ip}",
             "--demux-filter=demux_chromecast",
-            "--sub-file=" + subtitles_file if subtitles_file else "",
-            *args.player[1:],
+            *subtitles,
+            *m["player"][1:],
             m["path"],
         )
     else:
         if args.action in (SC.watch, SC.listen):
+            subtitles = ["-s", subtitles_file] if subtitles_file else ["--no-subs"]
             catt_log = processes.cmd(
                 "catt",
                 "-d",
                 args.chromecast_device,
                 "cast",
-                "-s",
-                subtitles_file if subtitles_file else consts.FAKE_SUBTITLE,
+                *subtitles,
                 m["path"],
             )
         else:
@@ -90,7 +91,6 @@ def calculate_duration(args, m) -> Tuple[int, int]:
 
 def listen_chromecast(args, m: dict) -> Optional[subprocess.CompletedProcess]:
     Path(consts.CAST_NOW_PLAYING).write_text(m["path"])
-    Path(consts.FAKE_SUBTITLE).touch()
     catt = which("catt") or "catt"
     start, end = calculate_duration(args, m)
 
@@ -101,8 +101,7 @@ def listen_chromecast(args, m: dict) -> Optional[subprocess.CompletedProcess]:
                 "-d",
                 args.chromecast_device,
                 "cast",
-                "-s",
-                consts.FAKE_SUBTITLE,
+                "--no-subs",
                 "--block",
                 "--seek-to",
                 str(start),
@@ -124,8 +123,7 @@ def listen_chromecast(args, m: dict) -> Optional[subprocess.CompletedProcess]:
                 "-d",
                 args.chromecast_device,
                 "cast",
-                "-s",
-                consts.FAKE_SUBTITLE,
+                "--no-subs",
                 "--block",
                 "--seek-to",
                 str(start),
@@ -184,7 +182,7 @@ def transcode(args, path) -> str:
         video_settings = ["-c:v", "copy"]
 
     print("Transcoding", temp_video)
-    processes.cmd_interactive(
+    r = processes.cmd_interactive(
         "ffmpeg",
         "-nostdin",
         "-loglevel",
@@ -205,11 +203,14 @@ def transcode(args, path) -> str:
         temp_video,
     )
 
-    Path(path).unlink()
-    shutil.move(temp_video, transcode_dest)
-    with args.db.conn:
-        args.db.conn.execute("UPDATE media SET path = ? where path = ?", [transcode_dest, path])
-    return transcode_dest
+    if Path(temp_video).exists():
+        Path(path).unlink()
+        shutil.move(temp_video, transcode_dest)
+        with args.db.conn:
+            args.db.conn.execute("UPDATE media SET path = ? where path = ?", [transcode_dest, path])
+        return transcode_dest
+    else:
+        return path
 
 
 def get_browser() -> Optional[str]:
@@ -524,7 +525,7 @@ def single_player(args, m):
     if system() == "Windows" or args.action in (SC.watch):
         r = processes.cmd(*m["player"], m["path"], strict=False)
     else:  # args.action in (SC.listen)
-        r = processes.cmd_interactive(*m["player"], m["path"])
+        r = processes.cmd_interactive(*m["player"], m["path"], strict=False)
 
     if m["player_need_sleep"]:
         try:

xklb/utils/consts.py

@@ -20,7 +20,6 @@ def random_string() -> str:
 
 TEMP_DIR = gettempdir()
 TEMP_SCRIPT_DIR = os.getenv("XDG_RUNTIME_DIR") or TEMP_DIR
-FAKE_SUBTITLE = str(Path(TEMP_DIR) / "sub.srt")  # https://github.com/skorokithakis/catt/issues/393
 CAST_NOW_PLAYING = str(Path(TEMP_DIR) / "catt_playing")
 SUB_TEMP_DIR = str(Path(TEMP_DIR) / "library_temp_subtitles" / random_string())
 DEFAULT_MPV_LISTEN_SOCKET = str(Path(TEMP_SCRIPT_DIR) / "mpv_socket")

xklb/utils/processes.py

@@ -140,8 +140,16 @@ def cmd_detach(*command, **kwargs) -> subprocess.CompletedProcess:
     return subprocess.CompletedProcess(command, 0, "Detached command is async")
 
 
-def cmd_interactive(*command) -> subprocess.CompletedProcess:
+def cmd_interactive(*command, strict=True) -> subprocess.CompletedProcess:
     return_code = os.spawnvpe(os.P_WAIT, command[0], command, os.environ)
+
+    if return_code != 0:
+        msg = f"[{shlex.join(command)}] exited {return_code}"
+        if strict:
+            raise RuntimeError(msg)
+        else:
+            log.info(msg)
+
     return subprocess.CompletedProcess(command, return_code)