ASMRManager 2.2.3__tar.gz → 2.2.5__tar.gz

{asmrmanager-2.2.3 → asmrmanager-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ASMRManager
-Version: 2.2.3
+Version: 2.2.5
 Summary: download, manage and play the voices on asmr.one
 Keywords: asmr,downloader,music,player,manager,cli,tui,commandline,terminal
 Author-Email: SLQY <sqiyel@gmail.com>

asmrmanager-2.2.5/asmrmanager/_version.py

@@ -0,0 +1 @@
+__version__ = "2.2.5"

{asmrmanager-2.2.3 → asmrmanager-2.2.5}/asmrmanager/cli/core.py

@@ -394,7 +394,7 @@ SEPARATOR = ":"
 def interval_preprocess_cb(ctx: click.Context, opt: click.Parameter, val: str):
     """
     input must be numeric or None,
-    and it returns a float/int/None value tuple
+    and it returns a float/int/str/None value tuple
     """
     if val is None:
         return (None, None)
@@ -404,12 +404,14 @@ def interval_preprocess_cb(ctx: click.Context, opt: click.Parameter, val: str):
     def _check(x: str):
         if x == "":
             return None
-        try:
-            xf: float = float(x)
-        except ValueError:
-            ctx.fail(f"{x} is not a valid number")
 
-        assert isinstance(xf, float)
+        if not x.isdigit():
+            if x[-1] in "hm" and x[:-1].isdigit():
+                return x
+            logger.warning(f"{x} is not a valid number or time")
+            return None
+
+        xf: float = float(x)
         if xf.is_integer():
             return int(xf)
         return xf
@@ -417,6 +419,19 @@ def interval_preprocess_cb(ctx: click.Context, opt: click.Parameter, val: str):
     return tuple(map(_check, vals))
 
 
+def time_interval_preprocess_cb(
+    ctx: click.Context, opt: click.Parameter, val: str
+):
+    return tuple(
+        map(
+            lambda x: str(x) + "m"
+            if (x is not None) and (not isinstance(x, str))
+            else x,
+            interval_preprocess_cb(ctx, opt, val),
+        )
+    )
+
+
 def pl_preprocess_cb(
     ctx: click.Context, param: click.Option, val: str | Tuple
 ) -> List[uuid.UUID]:

{asmrmanager-2.2.3 → asmrmanager-2.2.5}/asmrmanager/cli/dl.py

@@ -9,6 +9,7 @@ from asmrmanager.cli.core import (
     download_param_options,
     fm,
     interval_preprocess_cb,
+    time_interval_preprocess_cb,
     multi_rj_argument,
 )
 from asmrmanager.common.browse_params import BrowseParams
@@ -155,6 +156,12 @@ def check(source_ids: List[LocalSourceID]):
 @click.option(
     "--price", "-pr", help="pirce interval", callback=interval_preprocess_cb
 )
+@click.option(
+    "--duration",
+    "-d",
+    help="duration interval",
+    callback=time_interval_preprocess_cb,
+)
 @click.option(
     "all_",
     "--all/--select",
@@ -179,6 +186,7 @@ def search(
     rate: Tuple[float | None, float | None],
     sell: Tuple[int | None, int | None],
     price: Tuple[int | None, int | None],
+    duration: Tuple[str | None, str | None],
     browse_params: BrowseParams,
     download_params: DownloadParams,
     all_: bool,
@@ -194,12 +202,15 @@ def search(
 
         --tags tag1 --tags tag2 --no-tags tag3
 
-    for options like --rate, --sell, --price, you should give a interval like:
+    for options like --rate, --sell, --price, --duration you should give a interval like:
 
-        --rate 3.9:4.7 --sell 1000: --price :200
+        --rate 3.9:4.7 --sell 1000: --price :200 --duration 10:60
 
     the interval a:b means a <= x < b, if a or b is not given
     i.e. a: or :b, it means no lower or upper limit
+
+    for --duration, expressions like `1.5h(1.5 hours)`, `10m(10 minutes)` are allowed,
+    or by default, the unit is minute.
     """
     spider, db = create_downloader_and_database(
         download_params=download_params
@@ -209,7 +220,7 @@ def search(
             " ".join(
                 map(
                     lambda t: (t := t.strip())
-                    and ('-' + t[1:] if t.startswith("!") else t),
+                    and ("-" + t[1:] if t.startswith("!") else t),
                     keywords,
                 )
             ),
@@ -224,6 +235,7 @@ def search(
             rate=rate,
             sell=sell,
             price=price,
+            duration=duration,
             params=browse_params,
             all_=all_,
         )

{asmrmanager-2.2.3 → asmrmanager-2.2.5}/asmrmanager/cli/file.py

@@ -40,9 +40,9 @@ def del_(source_id: LocalSourceID):
 
     folders = folder_chooser_multiple(
         rj_path,
-        lambda p: any([
-            i.suffix != ".info" for i in p.iterdir() if not i.is_dir()
-        ]),
+        lambda p: any(
+            [i.suffix != ".info" for i in p.iterdir() if not i.is_dir()]
+        ),
     )
 
     for folder in folders:
@@ -157,7 +157,9 @@ def store(source_ids: List[LocalSourceID], replace: bool, all_: bool):
             assert file.with_suffix(f".{to}").exists()
             file.unlink()
 
-        def convert_all(from_: str, to: Literal["mp3", "flac", "m4a", "wav", "lrc"]):
+        def convert_all(
+            from_: str, to: Literal["mp3", "flac", "m4a", "wav", "lrc"]
+        ):
             for file in path.rglob(f"*.{from_}", case_sensitive=False):
                 convert(file, to)
 
@@ -166,10 +168,10 @@ def store(source_ids: List[LocalSourceID], replace: bool, all_: bool):
         if not code.strip():
             return
 
-        exec(code, {"path": path, "convert": convert, "convert_all": convert_all})
-
-
-
+        exec(
+            code,
+            {"path": path, "convert": convert, "convert_all": convert_all},
+        )
 
     db = create_database()
     try:
@@ -218,12 +220,12 @@ def diff(source_id: LocalSourceID):
 
     local_files = fm.get_all_files(source_id)
 
-    remote_files_should_down = set([
-        Path(i["path"]) for i in recovers if i["should_download"]
-    ])
-    remote_files_filterd = set([
-        Path(i["path"]) for i in recovers if not i["should_download"]
-    ])
+    remote_files_should_down = set(
+        [Path(i["path"]) for i in recovers if i["should_download"]]
+    )
+    remote_files_filterd = set(
+        [Path(i["path"]) for i in recovers if not i["should_download"]]
+    )
     filtered_but_downloaded = remote_files_filterd & local_files
     should_download_but_missing = remote_files_should_down - local_files
     added_new_files = (
@@ -288,9 +290,9 @@ def check(list_: bool):
             continue
 
         local_files = fm.get_all_files(source_id)
-        remote_files_should_down = set([
-            Path(i["path"]) for i in recovers if i["should_download"]
-        ])
+        remote_files_should_down = set(
+            [Path(i["path"]) for i in recovers if i["should_download"]]
+        )
         should_download_but_missing = remote_files_should_down - local_files
         if len(should_download_but_missing):
             logger.error(

{asmrmanager-2.2.3 → asmrmanager-2.2.5}/asmrmanager/common/fileconverter.py

@@ -8,12 +8,18 @@ def convert_vtt2lrc(vtt_path: Path):
 
     assert vtt_path.suffix == ".vtt"
     lrc_content = vtt2lrc(vtt_path)
-    with open(vtt_path.with_suffix(".lrc"), "w", encoding="utf-8") as f:
+    lrc_path = vtt_path.with_suffix(".lrc")
+    if len(vtt_path.suffixes) == 2:  # formats like `audio.mp3.vtt`
+        assert vtt_path.with_suffix(
+            ""
+        ).exists(), f"unknown vtt file suffixes, {vtt_path.suffixes}"
+        lrc_path = vtt_path.with_suffix("").with_suffix(".lrc")
+    with open(lrc_path, "w", encoding="utf-8") as f:
         f.write(lrc_content)
 
 
 def convert_audio_format(
-    audio_path: Path, dst: Literal["mp3", "flac","m4a", "wav"] = "mp3"
+    audio_path: Path, dst: Literal["mp3", "flac", "m4a", "wav"] = "mp3"
 ):
     from subprocess import run
 
@@ -27,11 +33,11 @@ def convert_audio_format(
         case "mp3":
             convert_args = ["mp3", "-ab", "320k"]
         case "flac":
-            convert_args = ["flac", '-compression_level', '5']
+            convert_args = ["flac", "-compression_level", "5"]
         case "wav":
             convert_args = ["pcm_s16le"]
         case "m4a":
-            convert_args = ["aac", '-ab', '320k']
+            convert_args = ["aac", "-ab", "320k"]
         case _:
             assert False
 

{asmrmanager-2.2.3 → asmrmanager-2.2.5}/asmrmanager/config.py

@@ -25,6 +25,7 @@ class Config:
     mpd_config: "MPDConfig"
     before_store: str = ""
 
+
 @dataclass
 class Filter:
     regex: str = ""  # 正则表达式

{asmrmanager-2.2.3 → asmrmanager-2.2.5}/asmrmanager/filemanager/manager.py

@@ -139,7 +139,7 @@ class FileManager:
             return
 
         if hook is not None:
-            logger.info(f'Execute hook function for: {rj_name}')
+            logger.info(f"Execute hook function for: {rj_name}")
             hook(self.download_path / rj_name)
 
         # if os.path.exists(self.storage_path / rj_name):
@@ -385,16 +385,20 @@ class FileManager:
     def get_all_files(self, source_id: LocalSourceID) -> Set[Path]:
         """get all files of source ID both in download and storage path"""
         source_name = id2source_name(source_id)
-        l1 = set([
-            i.relative_to(self.download_path / source_name)
-            for i in (self.download_path / source_name).rglob("*")
-            if not i.is_dir()
-        ])
-        l2 = set([
-            i.relative_to(self.storage_path / source_name)
-            for i in (self.storage_path / source_name).rglob("*")
-            if not i.is_dir()
-        ])
+        l1 = set(
+            [
+                i.relative_to(self.download_path / source_name)
+                for i in (self.download_path / source_name).rglob("*")
+                if not i.is_dir()
+            ]
+        )
+        l2 = set(
+            [
+                i.relative_to(self.storage_path / source_name)
+                for i in (self.storage_path / source_name).rglob("*")
+                if not i.is_dir()
+            ]
+        )
         return l1 | l2
 
     @classmethod

{asmrmanager-2.2.3 → asmrmanager-2.2.5}/asmrmanager/lrcplayer/main.py

@@ -34,7 +34,9 @@ class LRCPlayer(App):
     OPERATION_FREQ = 0.05
 
     def __init__(self, episodes: List[Music], *args, **kwargs):
+        episodes = sorted(episodes, key=lambda x: x.path)
         self.episodes = episodes
+        # logger.debug(self.episodes)
         match config.player:
             case "pygame":
                 from .player.pygameplayer import PyGamePlayer

{asmrmanager-2.2.3 → asmrmanager-2.2.5}/asmrmanager/spider/interface.py

@@ -91,6 +91,7 @@ class ASMRDownloadManager(AsyncManager):
         rate: Tuple[float | None, float | None],
         sell: Tuple[int | None, int | None],
         price: Tuple[int | None, int | None],
+        duration: Tuple[str | None, str | None],
         params: BrowseParams,
         all_: bool,
     ):
@@ -111,7 +112,12 @@ class ASMRDownloadManager(AsyncManager):
         filters += [f"$-circle:{nc}$" for nc in no_circle]
         filters += [f"$-age:{na}$" for na in no_age]
 
-        for name, value in (("rate", rate), ("sell", sell), ("price", price)):
+        for name, value in (
+            ("rate", rate),
+            ("sell", sell),
+            ("price", price),
+            ("duration", duration),
+        ):
             if value[0] is not None:
                 filters.append(f"${name}:{value[0]}$")
             if value[1] is not None:

{asmrmanager-2.2.3 → asmrmanager-2.2.5}/pyproject.toml

@@ -33,7 +33,7 @@ dependencies = [
 ]
 requires-python = ">=3.10"
 readme = "README.md"
-version = "2.2.3"
+version = "2.2.5"
 
 [project.license]
 text = "MIT"

asmrmanager-2.2.3/asmrmanager/_version.py

@@ -1 +0,0 @@
-__version__ = "2.2.3"