ASMRManager 2.2.1__tar.gz → 2.2.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ASMRManager
-Version: 2.2.1
+Version: 2.2.3
 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>
@@ -48,8 +48,9 @@ Description-Content-Type: text/markdown
 
 ### 下载
 
-支持网站所支持的所有索引方式(关键词，标签，会社，价格，声优，日期，年龄分级等等)，以及排序方式。
+支持网站所支持的所有索引方式(关键词，标签，会社，价格，声优，日期，年龄分级等等)以及排序方式。
 目前仅支持调用 IDM 或 aria2 下载。
+支持根据根据文件名对下载的文件进行过滤，以及对音频文件的格式转换。
 
 ```
 > asmr dl search --help
@@ -124,8 +125,6 @@ Options:
 
 ## 使用方法
 
-<!-- **注意**：由于网站最近更新了针对BJ和VJ的支持，本项目进行了很大的重构，2.0.0 版本暂并不保证稳定运行，如果没有对BJ和VJ的需求，可以考虑继续使用1代的最后一个版本`pip install ASMRManager[依赖]==1.9.1` -->
-
 本工具支持 `python >= 3.10`, 安装方法如下：
 
 ```shell
@@ -158,9 +157,11 @@ pip install ASMRManager[依赖]
 常用的命令有：
 - `dl search` 搜索并下载。
 - `info` 搜索某个 RJID 的具体信息
+- `file check` 检查下载目录下的文件是否按照规则被正确下载 
+- `file store` 将下载文件转移到存储目录(STORAGE_PATH)，并执行相应文件格式转换(详情见config.toml的before_store字段)
 - `view` 将选择文件并移动到 VIEW_PATH
-- `review` 为某个作品评分并评论(本地)
 - `pl add` 将某个音声添加到用户的云端播放列表(配合 `pl create` 使用)
+- `review` 为某个作品评分并评论(本地)
 
 > 使用命令时，如果不输入 RJID ，将会自动使用上一次命令的RJID。
 

{asmrmanager-2.2.1 → asmrmanager-2.2.3}/README.md

@@ -6,8 +6,9 @@
 
 ### 下载
 
-支持网站所支持的所有索引方式(关键词，标签，会社，价格，声优，日期，年龄分级等等)，以及排序方式。
+支持网站所支持的所有索引方式(关键词，标签，会社，价格，声优，日期，年龄分级等等)以及排序方式。
 目前仅支持调用 IDM 或 aria2 下载。
+支持根据根据文件名对下载的文件进行过滤，以及对音频文件的格式转换。
 
 ```
 > asmr dl search --help
@@ -82,8 +83,6 @@ Options:
 
 ## 使用方法
 
-<!-- **注意**：由于网站最近更新了针对BJ和VJ的支持，本项目进行了很大的重构，2.0.0 版本暂并不保证稳定运行，如果没有对BJ和VJ的需求，可以考虑继续使用1代的最后一个版本`pip install ASMRManager[依赖]==1.9.1` -->
-
 本工具支持 `python >= 3.10`, 安装方法如下：
 
 ```shell
@@ -116,9 +115,11 @@ pip install ASMRManager[依赖]
 常用的命令有：
 - `dl search` 搜索并下载。
 - `info` 搜索某个 RJID 的具体信息
+- `file check` 检查下载目录下的文件是否按照规则被正确下载 
+- `file store` 将下载文件转移到存储目录(STORAGE_PATH)，并执行相应文件格式转换(详情见config.toml的before_store字段)
 - `view` 将选择文件并移动到 VIEW_PATH
-- `review` 为某个作品评分并评论(本地)
 - `pl add` 将某个音声添加到用户的云端播放列表(配合 `pl create` 使用)
+- `review` 为某个作品评分并评论(本地)
 
 > 使用命令时，如果不输入 RJID ，将会自动使用上一次命令的RJID。
 

asmrmanager-2.2.3/asmrmanager/_version.py

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

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

@@ -93,7 +93,11 @@ def check(source_ids: List[LocalSourceID]):
 
 
 @click.command()
-@click.argument("text", type=str, default="")
+@click.argument(
+    "keywords",
+    type=str,
+    nargs=-1,
+)
 @click.option(
     "--tags", "-t", type=str, multiple=True, help="tags to include[multiple]"
 )
@@ -163,7 +167,7 @@ def check(source_ids: List[LocalSourceID]):
 @browse_param_options
 @download_param_options
 def search(
-    text: str,
+    keywords: Tuple[str],
     tags: Tuple[str],
     vas: Tuple[str],
     circle: str | None,
@@ -182,6 +186,10 @@ def search(
     """
     search and download ASMR
 
+    The keywords argument is used to filter the title of an ASMR.
+    Specially, you can pass a keyword starts with `!`
+    to exclude this word, eg: `!中文版`
+
     the [multiple] options means you can add multiple same option such as:
 
         --tags tag1 --tags tag2 --no-tags tag3
@@ -198,7 +206,13 @@ def search(
     )
     spider.run(
         spider.search(
-            text,
+            " ".join(
+                map(
+                    lambda t: (t := t.strip())
+                    and ('-' + t[1:] if t.startswith("!") else t),
+                    keywords,
+                )
+            ),
             tags=tags,
             vas=vas,
             circle=circle,

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

@@ -1,9 +1,10 @@
 import re
 from pathlib import Path
-from typing import List, Tuple
+from typing import List, Tuple, Literal
 
 import click
 
+from asmrmanager.config import config
 from asmrmanager.cli.core import (
     create_database,
     fm,
@@ -39,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:
@@ -136,6 +137,40 @@ def store(source_ids: List[LocalSourceID], replace: bool, all_: bool):
     store the downloaded files to the storage
     """
 
+    def before_store_hook(path: Path):
+        from asmrmanager.common.fileconverter import (
+            convert_audio_format,
+            convert_vtt2lrc,
+        )
+
+        def convert(
+            file: Path, to: Literal["mp3", "flac", "m4a", "wav", "lrc"]
+        ):
+            if to == "lrc":
+                assert file.suffix.lower() == ".vtt"
+                logger.debug(f"converting {file} to lrc")
+                convert_vtt2lrc(file)
+            else:
+                logger.debug(f"converting {file} to {to}")
+                convert_audio_format(file, to)
+
+            assert file.with_suffix(f".{to}").exists()
+            file.unlink()
+
+        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)
+
+        code = config.before_store
+        logger.debug("executing before_store_hook code: %s", code)
+        if not code.strip():
+            return
+
+        exec(code, {"path": path, "convert": convert, "convert_all": convert_all})
+
+
+
+
     db = create_database()
     try:
         if all_:
@@ -146,12 +181,12 @@ def store(source_ids: List[LocalSourceID], replace: bool, all_: bool):
             )
             if res is None or res is False:
                 return
-            fm.store_all(replace=replace)
+            fm.store_all(replace=replace, hook=before_store_hook)
             id_to_store = fm.list_("download")
 
         else:
             for rj_id in source_ids:
-                fm.store(rj_id, replace=replace)
+                fm.store(rj_id, replace=replace, hook=before_store_hook)
             id_to_store = source_ids
 
         for id_ in id_to_store:
@@ -162,10 +197,11 @@ def store(source_ids: List[LocalSourceID], replace: bool, all_: bool):
                 )
                 continue
             res.stored = True
-        db.commit()
         logger.info("succesfully stored all files")
     except DstItemAlreadyExistsException as e:
         logger.error("storing terminated for %s", e)
+    finally:
+        db.commit()
 
 
 @click.command()
@@ -182,12 +218,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 = (
@@ -252,9 +288,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.1 → asmrmanager-2.2.3}/asmrmanager/common/fileconverter.py

@@ -13,7 +13,7 @@ def convert_vtt2lrc(vtt_path: Path):
 
 
 def convert_audio_format(
-    audio_path: Path, dst: Literal["mp3", "flac", "wav"] = "mp3"
+    audio_path: Path, dst: Literal["mp3", "flac","m4a", "wav"] = "mp3"
 ):
     from subprocess import run
 
@@ -23,13 +23,15 @@ def convert_audio_format(
             " add it to your path"
         )
 
-    match dst:
+    match dst.lower():
         case "mp3":
-            convert_args = ["mp3", "-ab", "256k"]
+            convert_args = ["mp3", "-ab", "320k"]
         case "flac":
-            convert_args = ["flac"]
+            convert_args = ["flac", '-compression_level', '5']
         case "wav":
             convert_args = ["pcm_s16le"]
+        case "m4a":
+            convert_args = ["aac", '-ab', '320k']
         case _:
             assert False
 

{asmrmanager-2.2.1 → asmrmanager-2.2.3}/asmrmanager/common/vtt2lrc.py

@@ -16,7 +16,7 @@ def format_time(time):
 DEFAULT_THRESHOLD = timedelta(seconds=2)
 
 
-def vtt2lrc(vtt, header=True, threshold=DEFAULT_THRESHOLD):
+def vtt2lrc(vtt_path: Path, header=True, threshold=DEFAULT_THRESHOLD):
     lrc = ""
 
     if header:
@@ -24,6 +24,7 @@ def vtt2lrc(vtt, header=True, threshold=DEFAULT_THRESHOLD):
 
     last_end = parse_time("23:59:59.99")  # Insanely big value
 
+    vtt = vtt_path.read_text(encoding="utf-8")
     for chunk in vtt.split("\n\n")[1:]:
         if not chunk:
             continue
@@ -53,8 +54,7 @@ def vtt2lrc(vtt, header=True, threshold=DEFAULT_THRESHOLD):
     "vtt", type=click.Path(exists=True, dir_okay=False, path_type=Path)
 )
 def main(vtt: Path):
-    content = vtt.read_text(encoding="utf-8")
-    lrc = vtt2lrc(content)
+    lrc = vtt2lrc(vtt)
     with open(
         vtt.with_suffix("").with_suffix(".lrc"), "w", encoding="utf-8"
     ) as f:

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

@@ -23,7 +23,7 @@ class Config:
     playlist_aliases: Dict[str, str]
     player: Literal["mpd", "pygame"]
     mpd_config: "MPDConfig"
-
+    before_store: str = ""
 
 @dataclass
 class Filter:
@@ -89,4 +89,5 @@ config = Config(
     playlist_aliases=_config.get("playlist_aliases", {}),
     player=_config.get("player", "pygame"),
     mpd_config=MPDConfig(**_config.get("mpd_config", {})),
+    before_store=_config.get("before_store", ""),
 )

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

@@ -1,7 +1,7 @@
 import os
 import shutil
 from pathlib import Path
-from typing import Iterable, List, Literal, NamedTuple, Set, Tuple
+from typing import Callable, Iterable, List, Literal, NamedTuple, Set, Tuple
 
 import toml
 
@@ -124,7 +124,12 @@ class FileManager:
     def could_store(self):
         return self.storage_path_exists and self.download_path_exists
 
-    def store(self, source_id: LocalSourceID, replace=True):
+    def store(
+        self,
+        source_id: LocalSourceID,
+        replace=True,
+        hook: Callable[[Path], None] | None = None,
+    ):
         """sync download path and storage path"""
         # TODO 换用fcp实现？
         assert self.could_store()
@@ -133,6 +138,10 @@ class FileManager:
             logger.warning(f"item {rj_name} does not exists, skip it")
             return
 
+        if hook is not None:
+            logger.info(f'Execute hook function for: {rj_name}')
+            hook(self.download_path / rj_name)
+
         # if os.path.exists(self.storage_path / rj_name):
         #     if not exists_ok:
         #         logger.error(f"the item {rj_name} to store already exists!")
@@ -189,13 +198,15 @@ class FileManager:
         #     )
         #     exit(-1)
 
-    def store_all(self, replace=True):
+    def store_all(
+        self, replace=True, hook: Callable[[Path], None] | None = None
+    ):
         for file in os.listdir(self.download_path):
             source_id = source_name2id(SourceName(file))
             if source_id is None:
                 logger.warning(f"Ignore invalid file {file} in download path")
                 continue
-            self.store(source_id, replace=replace)
+            self.store(source_id, replace=replace, hook=hook)
 
     def could_view(self):
         """
@@ -374,20 +385,16 @@ 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.1 → asmrmanager-2.2.3}/asmrmanager/filemanager/resources/config.example.toml

@@ -36,6 +36,26 @@ download_method = "idm"
 # 若使用mpd请确保已安装mpd依赖并配置好mpd_config
 player = 'pygame'
 
+# asmr file store 前执行的脚本，若不需要可直接删除或留空，
+# 使用 Python 语法编写，运行时动态执行，并提供以下全局资源以供调用：
+
+# - path: pathlib.Path 音声的存储路径，download_path的子目录
+
+# - convert(file: pathlib.Path, to: Literal['mp3', 'wav', 'flac', 'm4a', 'lrc'])
+# 将单个文件转化为目标格式，mp3与m4a默认采用320k码率，flac默认使用压缩等级为5
+# 若使用to='lrc'，请确保原文件为vtt格式。
+
+# - convert_all(from_: Literal['mp3', 'wav', 'flac', 'm4a', 'vtt'], to: Literal['mp3', 'wav', 'flac', 'm4a', 'lrc'])
+# 将path 下的所有<from_>类型的文件转化为<to>类型，
+# 对convert函数的封装，其余细节与convert无异。
+
+before_store = '''
+convert_all('vtt', 'lrc')
+convert_all('wav', 'mp3')
+convert_all('flac', 'mp3')
+''''
+
+
 # 如使用aria2请配置此项，否则请忽略
 # 如果是在本地使用aria2，运行`aria2c --enable-rpc`，以下保持默认即可
 # 如果使用motrix，且没有更改过默认端口，请将端口(port)改为16800

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

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

asmrmanager-2.2.1/asmrmanager/_version.py

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