2.5.003

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

pdm.lock

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

xklb/__init__.py

@@ -382,7 +382,7 @@ def get_sibling_media(args, media):
                 new_media.append(d)
         media = new_media
 
-    # TODO: all-if>10, each-if=10
+    # TODO: all-if>10, each-if=10 --lower --upper functionality could be replicated here
 
     return media
 

xklb/db_media.py

@@ -71,7 +71,9 @@ def parse_args():
     parser.add_argument("--subtitle-languages", "--subtitle-language", "--sl", action=arg_utils.ArgparseList)
 
     parser.add_argument("--prefix", default=os.getcwd(), help=argparse.SUPPRESS)
-    parser.add_argument("--relative", action="store_true", help="Replicate website file tree")
+    parser.add_argument(
+        "--no-relative", dest="relative", action="store_false", help="Do not replicate website file tree"
+    )
     parser.add_argument("--ext")
 
     parser.add_argument("--print", "-p", default="", const="p", nargs="?", help=argparse.SUPPRESS)

xklb/dl_extract.py

@@ -13,7 +13,7 @@
 
 
 def parse_args() -> argparse.Namespace:
-    parser = argparse.ArgumentParser(prog="library dedupe", usage=usage.dedupe)
+    parser = argparse.ArgumentParser(prog="library dedupe-media", usage=usage.dedupe_media)
 
     profile = parser.add_mutually_exclusive_group()
     profile.add_argument(

xklb/media/dedupe.py

@@ -516,13 +516,16 @@ def process_playqueue(args) -> None:
                 if args.folder_glob:
                     media = [{"path": s} for s in file_utils.fast_glob(p)]
                 elif args.action in SC.watch:
-                    media = [{"path": s} for s in file_utils.get_video_files(p)]
+                    media = [{"path": s} for s in file_utils.rglob(str(p), consts.VIDEO_EXTENSIONS)[0]]
                 elif args.action == SC.listen:
-                    media = [{"path": s} for s in file_utils.get_audio_files(p)]
+                    media = [
+                        {"path": s}
+                        for s in file_utils.rglob(str(p), consts.VIDEO_EXTENSIONS | consts.AUDIO_ONLY_EXTENSIONS)[0]
+                    ]
                 elif args.action in SC.view:
-                    media = [{"path": s} for s in file_utils.get_image_files(p)]
+                    media = [{"path": s} for s in file_utils.rglob(str(p), consts.IMAGE_EXTENSIONS)[0]]
                 elif args.action in SC.read:
-                    media = [{"path": s} for s in file_utils.get_text_files(p)]
+                    media = [{"path": s} for s in file_utils.rglob(str(p), consts.TEXTRACT_EXTENSIONS)[0]]
                 else:
                     media = [{"path": s} for s in file_utils.rglob(str(p))[0]]
             else:

xklb/play_actions.py

@@ -23,7 +23,7 @@ def parse_args():
     parser.add_argument("--musicology", action="store_true")
     parser.add_argument("--radio", action="store_true")
 
-    parser.add_argument("--search-in", default='torrents')
+    parser.add_argument("--search-in", default="torrents")
 
     parser.add_argument("--cookie", required=True)
     parser.add_argument("--cookies", help="path to a Netscape formatted cookies file")
@@ -38,6 +38,7 @@ def parse_args():
     log.info(objects.dict_filter_bool(args.__dict__))
     return args
 
+
 def get_page(args, query_data):
     import pandas as pd
 

xklb/scratch/mam_search.py

@@ -1,4 +1,4 @@
-import argparse, json, random, re, sys, time
+import argparse, json, random, sys, time
 from pathlib import Path
 from typing import Set
 from urllib.parse import urlparse
@@ -204,22 +204,6 @@ def add_media(args, media):
     args.db["media"].insert_all(media, pk="id", alter=True, replace=True)
 
 
-def is_web_dir(path):
-    if path.endswith("/"):
-        return True
-
-    patterns = [
-        r"/index\.php\?dir=",
-        r"/index\.php$",
-        r"/index\.html?$",
-    ]
-    for pattern in patterns:
-        if re.search(pattern, path, re.IGNORECASE):
-            return True
-
-    return False
-
-
 def spider(args, paths: Set):
     get_urls = iterables.return_unique(extract_links.get_inner_urls)
 
@@ -236,7 +220,7 @@ def spider(args, paths: Set):
             f"Pages to scan {len(paths)} link scan: {new_media_count} new [{len(known_paths)} known]"
         )
 
-        if is_web_dir(path):
+        if web.is_index(path):
             for a_ref in get_urls(args, path):
                 if a_ref is None:
                     break
@@ -247,7 +231,7 @@ def spider(args, paths: Set):
 
                 if link in (paths | traversed_paths):
                     continue
-                if is_web_dir(link):
+                if web.is_index(link):
                     if web.is_subpath(path, link):
                         paths.add(link)
                     continue
@@ -339,7 +323,7 @@ def web_add(args=None) -> None:
         try:
             for playlist_path in arg_utils.gen_paths(args):
                 spider(args, {playlist_path})
-                if is_web_dir(playlist_path):
+                if web.is_index(playlist_path):
                     add_playlist(args, playlist_path)
 
         finally:

xklb/scripts/web_add.py

@@ -1,5 +1,4 @@
-import operator
-import argparse, random, sys
+import argparse, operator, random, sys
 from ast import literal_eval
 from pathlib import Path
 
@@ -220,16 +219,10 @@ def override_config(parser, extractor_config, args):
     args_env = argparse.Namespace(**{**default_args, **extractor_config, **overridden_args})
     return args_env
 
-ops = {
-    '<': operator.lt,
-    '<=': operator.le,
-    '==': operator.eq,
-    '!=': operator.ne,
-    '>=': operator.ge,
-    '>': operator.gt
-}
+
+ops = {"<": operator.lt, "<=": operator.le, "==": operator.eq, "!=": operator.ne, ">=": operator.ge, ">": operator.gt}
+
 
 def cmp(arg1, op, arg2):
     operation = ops.get(op)
     return operation(arg1, arg2)
-

xklb/utils/arg_utils.py

@@ -128,7 +128,7 @@ def reddit_frequency(frequency) -> str:
     return mapper[frequency]
 
 
-SKIP_MEDIA_CHECK = [".iso", ".vob"]
+SKIP_MEDIA_CHECK = [".iso", ".img", ".vob"]
 
 SPEECH_RECOGNITION_EXTENSIONS = set("mp3|ogg|wav".split("|"))
 OCR_EXTENSIONS = set("gif|jpg|jpeg|png|tif|tff|tiff".split("|"))
@@ -139,9 +139,9 @@ def reddit_frequency(frequency) -> str:
         "|mac|aptx|aptxhd|aqt|ast|obu|avi|avr|avs|avs2|avs3|bfstm|bcstm|binka"
         "|bit|bmv|brstm|cdg|cdxl|xl|c2|302|daud|str|adp|dav|dss|dts|dtshd|dv"
         "|dif|divx|cdata|eac3|paf|fap|flm|flv|fsb|fwse|g722|722|tco|rco"
-        "|g723_1|g729|genh|gsm|h261|h26l|h264|264|avc|mts|hca|hevc|h265|265|idf"
+        "|g723_1|g729|genh|gsm|h261|h26l|h264|264|avc|mts|m2ts|hca|hevc|h265|265|idf"
         "|ifv|cgi|ipu|sf|ircam|ivr|kux|669|abc|amf|ams|dbm|dmf|dsm|far|it|mdl"
-        "|med|mod|mt2|mtm|okt|psm|ptm|s3m|stm|ult|umx|xm|itgz|itr|itz|iso"
+        "|med|mod|mt2|mtm|okt|psm|ptm|s3m|stm|ult|umx|xm|itgz|itr|itz|iso|img"
         "|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"

xklb/utils/consts.py

@@ -603,6 +603,22 @@ def construct_absolute_url(base_url, href):
     return href
 
 
+def is_index(url):
+    if url.endswith("/"):
+        return True
+
+    patterns = [
+        r"/index\.php\?dir=",
+        r"/index\.php$",
+        r"/index\.html?$",
+    ]
+    for pattern in patterns:
+        if re.search(pattern, url, re.IGNORECASE):
+            return True
+
+    return False
+
+
 def is_subpath(parent_url, child_url):
     child = urlparse(child_url)
     parent = urlparse(parent_url)