ASMRManager 2.9.0__tar.gz → 2.9.2__tar.gz

{asmrmanager-2.9.0 → asmrmanager-2.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ASMRManager
-Version: 2.9.0
+Version: 2.9.2
 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>
@@ -216,8 +216,8 @@ asmr dl get 300015443  # 本项目存储VJ与BJ所使用的ID（"3" + 8位VJ号
 检查下载目录下文件是否下载完全（默认会计算hash并向服务器验证，较为耗时。可使用 --offline 跳过）
 
 ```shell
-asmr file check
-asmr file check --list | xargs asmr dl get --force --replace   # 重新下载所有不完整的文件，以bash shell为例
+asmr file check --all
+asmr file check --all --list | xargs asmr dl get --force --replace   # 重新下载所有不完整的文件，以bash shell为例
 ```
 
 将下载的文件转移到存储目录(STORAGE_PATH)，并执行相应文件格式转换(详情见config.toml的before_store字段)

{asmrmanager-2.9.0 → asmrmanager-2.9.2}/README.md

@@ -167,8 +167,8 @@ asmr dl get 300015443  # 本项目存储VJ与BJ所使用的ID（"3" + 8位VJ号
 检查下载目录下文件是否下载完全（默认会计算hash并向服务器验证，较为耗时。可使用 --offline 跳过）
 
 ```shell
-asmr file check
-asmr file check --list | xargs asmr dl get --force --replace   # 重新下载所有不完整的文件，以bash shell为例
+asmr file check --all
+asmr file check --all --list | xargs asmr dl get --force --replace   # 重新下载所有不完整的文件，以bash shell为例
 ```
 
 将下载的文件转移到存储目录(STORAGE_PATH)，并执行相应文件格式转换(详情见config.toml的before_store字段)

asmrmanager-2.9.2/asmrmanager/_version.py

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

{asmrmanager-2.9.0 → asmrmanager-2.9.2}/asmrmanager/cli/core.py

@@ -93,6 +93,7 @@ def create_downloader_and_database(
             aria2_config=config.aria2_config,
             limit=config.api_max_concurrent_requests,
             fetch_cover=config.fetch_cover,
+            tagger=config.default_tagger,
         ),
         db,
     )
@@ -437,7 +438,9 @@ def multi_rj_argument(convert: Literal[False, "local", "remote"] = False):
 SEPARATOR = ":"
 
 
-def interval_preprocess_cb(ctx: click.Context, opt: click.Parameter, val: str):
+def interval_preprocess_cb(
+    _ctx: click.Context, _opt: click.Parameter, val: str
+):
     """
     input must be numeric or None,
     and it returns a float/int/str/None value tuple
@@ -470,9 +473,11 @@ def time_interval_preprocess_cb(
 ):
     return tuple(
         map(
-            lambda x: str(x) + "m"
-            if (x is not None) and (not isinstance(x, str))
-            else x,
+            lambda x: (
+                str(x) + "m"
+                if (x is not None) and (not isinstance(x, str))
+                else x
+            ),
             interval_preprocess_cb(ctx, opt, val),
         )
     )

{asmrmanager-2.9.0 → asmrmanager-2.9.2}/asmrmanager/cli/dl.py

@@ -283,8 +283,10 @@ def search(
         spider.search(
             " ".join(
                 map(
-                    lambda t: (t := t.strip())
-                    and ("-" + t[1:] if t.startswith("!") else t),
+                    lambda t: (
+                        (t := t.strip())
+                        and ("-" + t[1:] if t.startswith("!") else t)
+                    ),
                     keywords,
                 )
             ),

{asmrmanager-2.9.0 → asmrmanager-2.9.2}/asmrmanager/cli/file.py

@@ -153,12 +153,21 @@ def recover(source_id: LocalSourceID, regex: str, ignore_filter: bool):
     show_default=True,
     help="check files before storing",
 )
+@click.option(
+    "--on-error",
+    "-e",
+    type=click.Choice(["abort", "skip"], case_sensitive=False),
+    default="abort",
+    show_default=True,
+    help="what to do when a check failed",
+)
 def store(
     source_ids: List[LocalSourceID],
     no_convert: bool,
     replace: bool,
     all_: bool,
     check: Literal["none", "offline", "online"],
+    on_error: Literal["abort", "skip"],
 ):
     """
     store the downloaded files to the storage
@@ -204,8 +213,9 @@ def store(
             else:
                 src_paths = list(
                     filter(
-                        lambda p: not p.is_dir()
-                        and p.suffix.lower() != f".{to}",
+                        lambda p: (
+                            not p.is_dir() and p.suffix.lower() != f".{to}"
+                        ),
                         path.rglob(f"*.{from_}", case_sensitive=False),
                     )
                 )
@@ -269,7 +279,12 @@ def store(
                 )
                 if not success:
                     logger.error("Stop storing due to check failed")
-                    return
+                    if on_error == "abort":
+                        return
+                    elif on_error == "skip":
+                        continue
+                    else:
+                        assert False
             fm.store(id_, replace=replace, hook=hook)
 
             res = db.check_exists(id_)
@@ -353,15 +368,21 @@ def verify_voices(source_id: LocalSourceID, offline: bool) -> bool:
         logger.error(f"failed to load recover for id {source_id}")
         return False
 
-    # local_files = fm.get_all_files(source_id)
+    local_files = fm.get_all_files(source_id)
+    for p in local_files:
+        if p.suffix == ".aria2":
+            logger.error(f"Aria2 control file found: {p}")
+            return False
     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
     should_download_but_missing = set(
         filter(
-            lambda p: not any(
-                fm.check_exists(f"{id2source_name(source_id)}/{str(p)}")
+            lambda p: (
+                not any(
+                    fm.check_exists(f"{id2source_name(source_id)}/{str(p)}")
+                )
             ),
             remote_files_should_down,
         )
@@ -375,6 +396,7 @@ def verify_voices(source_id: LocalSourceID, offline: bool) -> bool:
 
     if offline:
         return True
+    logger.info(f"Start hash verification: {source_id}")
 
     remote_files_should_down_list = [
         Path(i["path"]) for i in recovers if i["should_download"]
@@ -454,12 +476,25 @@ def verify_voices(source_id: LocalSourceID, offline: bool) -> bool:
     show_default=True,
     help="only list source id (pipe it to `dl get --force` to redownload them)",
 )
-def check(list_: bool, offline: bool):
+@click.option(
+    "--all",
+    "-a",
+    "all_",
+    is_flag=True,
+    default=False,
+    show_default=True,
+    help="check all files in download path",
+)
+@multi_rj_argument(convert="local")
+def check(
+    source_ids: list[LocalSourceID], list_: bool, offline: bool, all_: bool
+):
     """
     check for download path for files to be downloaded correctly without missing or fail.
     """
-    # TODO: check hash with xxhash3
-    source_ids = fm.list_("download")
+    if all_:
+        source_ids = list(fm.list_("download"))
+
     for source_id in source_ids:
         success = verify_voices(source_id, offline)
         if not success and list_:

{asmrmanager-2.9.0 → asmrmanager-2.9.2}/asmrmanager/cli/main.py

@@ -46,12 +46,15 @@ try:
     import importlib.util
 
     if importlib.util.find_spec("trogon"):
+
         @click.command("tui", help="Open Textual TUI.")
         @click.pass_context
         def tui(ctx: click.Context):
             from trogon import Trogon  # type: ignore
+
             if ctx.parent is not None:
                 Trogon(ctx.parent.command, click_context=ctx).run()
+
         main.add_command(tui)
 except ImportError:
     pass

{asmrmanager-2.9.0 → asmrmanager-2.9.2}/asmrmanager/cli/sql.py

@@ -25,8 +25,20 @@ class SQLName(click.ParamType):
 
 @click.command()
 @click.argument("sql_name", type=SQLName())
-@click.option("--edit", '-e', is_flag=True, default=False, help="whether to open an editor")
-@click.option("--raw", '-r', is_flag=True, default=False, help="output sql results as json")
+@click.option(
+    "--edit",
+    "-e",
+    is_flag=True,
+    default=False,
+    help="whether to open an editor",
+)
+@click.option(
+    "--raw",
+    "-r",
+    is_flag=True,
+    default=False,
+    help="output sql results as json",
+)
 @click.option(
     "--save/--no-save",
     "-s/-ns",
@@ -55,7 +67,7 @@ def sql(sql_name: str, save: bool, edit: bool, raw: bool):
     temp_file_path.write_text(
         sql_path.read_text(encoding="utf8"), encoding="utf8"
     )
-    if edit: 
+    if edit:
         run(f'{config.editor} "{temp_file_path}"', shell=True)
     # db_path = temp_file_path.with_name('data.db')
     # print(db_path, temp_file_path)

{asmrmanager-2.9.0 → asmrmanager-2.9.2}/asmrmanager/cli/utils.py

@@ -73,9 +73,11 @@ def convert(
 
         src_paths = list(
             filter(
-                lambda p: not p.is_dir()
-                and p.suffix.lower() in [".flac", ".wav", ".m4a"]
-                and p.suffix.lower() != f".{mode}",
+                lambda p: (
+                    not p.is_dir()
+                    and p.suffix.lower() in [".flac", ".wav", ".m4a"]
+                    and p.suffix.lower() != f".{mode}"
+                ),
                 path.rglob("*.*"),
             )
         )

{asmrmanager-2.9.0 → asmrmanager-2.9.2}/asmrmanager/cli/which.py

@@ -1,4 +1,4 @@
-import os
+import subprocess
 
 import click
 
@@ -22,9 +22,9 @@ def which(source_id: LocalSourceID, show: bool):
         import sys
 
         if sys.platform == "win32":
-            os.system(f'explorer.exe "{path}"')
+            subprocess.Popen(["explorer.exe", path], start_new_session=True)
         elif sys.platform.startswith("linux"):
-            os.system(f'xdg-open "{path}"')
+            subprocess.Popen(["xdg-open", path], start_new_session=True)
         else:
             logger.error(
                 "option --show is for windows and XDG based linux desktop environment only, if you are using other platform, using"

asmrmanager-2.9.2/asmrmanager/common/__init__.py

@@ -0,0 +1,11 @@
+MUSIC_SUFFIXES = (
+    ".mp3",
+    ".wav",
+    ".m4a",
+    ".flac",
+    ".wma",
+    ".mp4",
+    ".mkv",
+    ".avi",
+    ".wmv",  # some works only have video files, such as RJ265135"
+)

{asmrmanager-2.9.0 → asmrmanager-2.9.2}/asmrmanager/common/fileconverter.py

@@ -96,6 +96,7 @@ class AudioConverter:
     ):
         self.tasks_total = len(src)
         self.tasks_done = 0
+        self.update_total_progress()
 
         match dst.lower():
             case "mp3":
@@ -122,8 +123,9 @@ class AudioConverter:
                         x, x.with_suffix(f".{dst}"), convert_args
                     ),
                     filter(
-                        lambda p: not p.is_dir()
-                        and p.suffix.lower() != f".{dst}",
+                        lambda p: (
+                            not p.is_dir() and p.suffix.lower() != f".{dst}"
+                        ),
                         src,
                     ),
                 )

{asmrmanager-2.9.0 → asmrmanager-2.9.2}/asmrmanager/common/output.py

@@ -64,7 +64,7 @@ def print_table(
     rows,
     raw=False,
     image_paths: list[str] | None = None,
-    image_size=(8, 3),
+    image_size=(16, 6),
 ):
     if raw or not support_image():
         _print_table(titles, rows, raw)

{asmrmanager-2.9.0 → asmrmanager-2.9.2}/asmrmanager/config.py

@@ -19,6 +19,7 @@ class Config:
     download_path: str
     storage_path: str
     view_path: str
+    default_tagger: Literal["tag", "tagw"]
     tag_strategy: Literal["common_only", "accept_all", "except_rejected"] | str
     tag_filter: List[str]
     fetch_cover: bool
@@ -30,7 +31,7 @@ class Config:
     aria2_config: "Aria2Config"
     subtitle_config: "SubtitleConfig"
     playlist_aliases: Dict[str, str]
-    player: Literal["mpd", "pygame"]
+    player: Literal["mpd", "pygame", "sounddevice"]
     mpd_config: "MPDConfig"
     before_store: str = ""
 
@@ -101,6 +102,7 @@ config = Config(
     download_path=_config["download_path"],
     storage_path=_config["storage_path"],
     view_path=_config["view_path"],
+    default_tagger=_config.get("default_tagger", "tag"),
     tag_strategy=_config.get("tag_strategy", "common_only"),
     tag_filter=_config["tag_filter"],
     fetch_cover=_config.get("fetch_cover", False),
@@ -127,4 +129,7 @@ if env_concurrency_limit := os.getenv("ASMR_CONCURRENCY_LIMIT"):
 if os.getenv("ASMR_DISABLE_COVER") == "1":
     config.display_cover = False
 
+if (__tagger := os.getenv("ASMR_DEFAULT_TAGGER")) in ("tag", "tagw"):
+    config.default_tagger = __tagger
+
 logger.debug(f"Config loaded: {config}")

{asmrmanager-2.9.0 → asmrmanager-2.9.2}/asmrmanager/filemanager/resources/config.example.toml

@@ -37,6 +37,13 @@ storage_path = "~/Music/asmr"
 # 如不使用 view 方法可以设为空
 view_path = "~/Desktop/asmr"
 
+# [可选]
+# 默认标签搜索策略，可选值为 tag 或 tagw
+# 默认 tag 将排除用户添加的低愿力标签
+# 如果你希望搜索它们可以使用 tagw
+# 详见：https://t.me/asmr_one_chan/79
+default_tagger = "tag"
+
 # [高级]
 # 标签接受策略，具体说明参考官方频道：https://t.me/asmr_one_chan/73
 # 可选项有：
@@ -56,6 +63,8 @@ view_path = "~/Desktop/asmr"
 # 因此，如果你特别讨厌某个标签，那么对于包含该标签的作品，即使票数并不多，也可以考虑接受该标签，这样在下一步的tag_filter中就可以过滤掉这个作品。
 # 例如下面的设置，将对于特定的标签只需分数大于2即考虑接受，而一般标签需要分数大于5：
 # tag_strategy = "common_only or (voteRank >= 5 or (tag['name'] in ['tagname1', 'tagname2'] and voteRank >= 2))"
+#
+# 请注意当default_tagger = "tag" 时，将不会搜到低愿力标签，即voteStatus != 0
 
 # 默认会过滤除普通标签外的所有标签
 tag_strategy = "common_only"
@@ -83,7 +92,7 @@ display_cover = false
 editor = "code --wait"
 
 # [可选]
-# 下载所用的工具，可选则idm或aria2，请注意需安装对应的依赖项
+# 下载所用的工具，可选择idm或aria2，请注意需安装对应的依赖项
 download_method = "idm"
 
 # [高级]

{asmrmanager-2.9.0 → asmrmanager-2.9.2}/asmrmanager/lrcplayer/player/pygameplayer.py

@@ -5,7 +5,7 @@ from .base import BasePlayer, Music
 
 try:
     with contextlib.redirect_stdout(None):
-        from pygame import mixer
+        from pygame import mixer  # type: ignore
 except ImportError:
     raise ImportError(
         "pygame is not installed, please install asmrmanager with pygame"

{asmrmanager-2.9.0 → asmrmanager-2.9.2}/asmrmanager/spider/downloader.py

@@ -149,8 +149,10 @@ class ASMRDownloadAPI(ASMRAPI):
                 )
             if any(
                 map(
-                    lambda f: 1 <= f.download_order <= download_order
-                    and f.path.suffix.lower() in MUSIC_SUFFIXES,
+                    lambda f: (
+                        1 <= f.download_order <= download_order
+                        and f.path.suffix.lower() in MUSIC_SUFFIXES
+                    ),
                     file_list_with_order,
                 )
             ):
@@ -215,7 +217,7 @@ class ASMRDownloadAPI(ASMRAPI):
         logger.debug("final file list: %s", file_list)
 
         self.create_recover_file(file_list, voice_path)
-        if self.fetch_cover:
+        if self.fetch_cover and all(f.path != 'cover.jpg' for f in file_list):
             await self.download_cover(voice_id, voice_path)
         await self.create_dir_and_download(file_list)
 

{asmrmanager-2.9.0 → asmrmanager-2.9.2}/asmrmanager/spider/interface.py

@@ -97,6 +97,7 @@ class ASMRDownloadManager(AsyncManager):
         aria2_config: Aria2Config | None = None,
         limit: int = 4,
         fetch_cover: bool = False,
+        tagger: Literal["tag", "tagw"] = "tag",
     ):
         self.downloader = ASMRDownloadAPI(
             name=name,
@@ -112,6 +113,7 @@ class ASMRDownloadManager(AsyncManager):
         )
         super().__init__(self.downloader)
         self.id_should_download = id_should_download or (lambda _: True)
+        self.tagger = tagger
 
     async def get(self, ids: List[RemoteSourceID]):
         tasks = []
@@ -152,8 +154,8 @@ class ASMRDownloadManager(AsyncManager):
 
         filters = []
 
-        filters += [f"$tag:{t}$" for t in tags]
-        filters += [f"$-tag:{nt}$" for nt in no_tags]
+        filters += [f"${self.tagger}:{t}$" for t in tags]
+        filters += [f"$-{self.tagger}:{nt}$" for nt in no_tags]
 
         filters += [f"$va:{va}$" for va in vas]
         filters += [f"$-va:{nva}$" for nva in no_vas]

{asmrmanager-2.9.0 → asmrmanager-2.9.2}/pyproject.toml

@@ -33,7 +33,7 @@ dependencies = [
 ]
 requires-python = ">=3.12"
 readme = "README.md"
-version = "2.9.0"
+version = "2.9.2"
 
 [project.license]
 text = "MIT"

asmrmanager-2.9.0/asmrmanager/_version.py

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

asmrmanager-2.9.0/asmrmanager/common/__init__.py

@@ -1 +0,0 @@
-MUSIC_SUFFIXES = (".mp3", ".wav", ".m4a", ".flac")