2.5.012

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

xklb/__init__.py

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

xklb/fs_extract.py

@@ -213,7 +213,11 @@ def extract_metadata(mp_args, path) -> Optional[Dict[str, int]]:
     if getattr(mp_args, "process", False):
         if objects.is_profile(mp_args, DBType.audio) and Path(path).suffix not in [".opus", ".mka"]:
             path = media["path"] = str(
-                process_audio.process_path(path, split_longer_than=2160 if "audiobook" in path.lower() else None)
+                process_audio.process_path(
+                    path,
+                    split_longer_than=2160 if "audiobook" in path.lower() else None,
+                    delete_broken=getattr(mp_args, "delete_unplayable", False),
+                )
             )
 
     return media

xklb/scripts/process_audio.py

@@ -35,6 +35,7 @@ def process_path(
     min_split_segment=nums.human_to_seconds(DEFAULT_MIN_SPLIT),
     dry_run=False,
     delete_video=False,
+    delete_broken=False,
 ):
     path = Path(path)
     assert path.exists()
@@ -60,8 +61,11 @@ def process_path(
         assert bitrate > 0
         assert channels > 0
         assert source_rate > 0
-    except AssertionError as e:
-        log.exception("Audio format likely misdetected: %s", path)
+    except AssertionError:
+        log.exception("Broken file or audio format misdetected: %s", path)
+        if delete_broken:
+            path.unlink()
+            return None
         return path
 
     ff_opts: List[str] = []
@@ -128,7 +132,16 @@ def process_path(
     if dry_run:
         print(cmd)
     else:
-        subprocess.check_call(cmd, shell=True)
+        try:
+            subprocess.check_call(cmd, shell=True)
+        except subprocess.CalledProcessError:
+            log.exception("Could not transcode: %s", path)
+            if delete_broken:
+                path.unlink()
+                return None
+            else:
+                raise
+
         if video_stream:
             if delete_video:
                 path.unlink()  # Remove original

xklb/utils/consts.py

@@ -131,7 +131,7 @@ def reddit_frequency(frequency) -> str:
 
 SPEECH_RECOGNITION_EXTENSIONS = set("mp3|ogg|wav".split("|"))
 OCR_EXTENSIONS = set("gif|jpg|jpeg|png|tif|tff|tiff".split("|"))
-AUDIO_ONLY_EXTENSIONS = set("opus|oga|ogg|mp3|mpga|m2a|m4a|flac|wav|wma|aac|aa3|ac3|ape|mid|midi".split("|"))
+AUDIO_ONLY_EXTENSIONS = set("mka|opus|oga|ogg|mp3|mpga|m2a|m4a|flac|wav|wma|aac|aa3|ac3|ape|mid|midi".split("|"))
 VIDEO_EXTENSIONS = set(
     (
         "str|aa|aax|acm|adf|adp|dtk|ads|ss2|adx|aea|afc|aix|al|apl"
@@ -144,7 +144,7 @@ def reddit_frequency(frequency) -> str:
         "|mdgz|mdr|mdz|s3gz|s3r|s3z|xmgz|xmr|xmz|669|amf|ams|dbm|digi|dmf"
         "|dsm|dtm|far|gdm|ice|imf|it|j2b|m15|mdl|med|mmcmp|mms|mo3|mod|mptm"
         "|mt2|mtm|nst|okt|ogm|ogv|plm|ppm|psm|pt36|ptm|s3m|sfx|sfx2|st26|stk|stm"
-        "|stp|ult|umx|wow|xm|xpk|flv|dat|lvf|m4v|mkv|ts|tp|mk3d|mka|mks|webm|mca|mcc"
+        "|stp|ult|umx|wow|xm|xpk|flv|dat|lvf|m4v|mkv|ts|tp|mk3d|webm|mca|mcc"
         "|mjpg|mjpeg|mpg|mpeg|mpo|j2k|mlp|mods|moflex|mov|mp4|3gp|3g2|mj2|psp|m4b"
         "|ism|ismv|isma|f4v|mp2|mpa|mpc|mjpg|mpl2|msf|mtaf|ul|musx|mvi|mxg"
         "|v|nist|sph|nsp|nut|obu|oma|omg|pjs|pvf|yuv|cif|qcif|rgb|rt|rsd|rmvb|rm"
@@ -153,6 +153,7 @@ def reddit_frequency(frequency) -> str:
         "|v210|yuv10|vag|vc1|rcv|vob|viv|vpk|vqf|vql|vqe|wmv|wsd|xmv|xvag|yop|y4m"
     ).split("|")
 )
+SUBTITLE_EXTENSIONS = set("srt|vtt|mks".split("|"))
 TEXTRACT_EXTENSIONS = set(
     "csv|tab|tsv|doc|docx|eml|epub|json|htm|html|msg|odt|pdf|pptx|ps|rtf|txt|log|xlsx|xls".split("|")
 )