easyrip 4.5.1__tar.gz → 4.6.1__tar.gz

{easyrip-4.5.1 → easyrip-4.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easyrip
-Version: 4.5.1
+Version: 4.6.1
 Author: op200
 License-Expression: AGPL-3.0-or-later
 Project-URL: Homepage, https://github.com/op200/EasyRip

{easyrip-4.5.1 → easyrip-4.6.1}/easyrip/__main__.py

@@ -103,7 +103,7 @@ def run() -> NoReturn:
     cmd_ctv_tuple = tuple(ct.value for ct in Cmd_type if ct != Cmd_type.Option)
     prompt_history = (
         ConfigFileHistory(easyrip_prompt.PROMPT_HISTORY_FILE)
-        if config.get_user_profile(Config_key.prompt_history_save_file)
+        if config.get_user_profile(Config_key.save_prompt_history)
         else InMemoryHistory()
     )
 

{easyrip-4.5.1 → easyrip-4.6.1}/easyrip/easyrip_command.py

@@ -244,7 +244,7 @@ class Cmd_type(enum.Enum):
             Cmd_type_val(("list",)),
             Cmd_type_val(
                 ("set",),
-                childs=tuple(Cmd_type_val((k,)) for k in Config_key._value2member_map_),
+                childs=tuple(Cmd_type_val((k,)) for k in Config_key._member_map_),
             ),
         ),
     )

{easyrip-4.5.1 → easyrip-4.6.1}/easyrip/easyrip_config/config.py

@@ -1,23 +1,30 @@
 import json
 import os
 from pathlib import Path
+from typing import Literal, get_origin, overload
 
 from ..easyrip_log import log
 from ..easyrip_mlang import all_supported_lang_map, gettext
 from ..global_val import CONFIG_DIR
-from .config_key import CONFIG_VERSION, Config_key
+from ..utils import type_match
+from .config_key import CONFIG_TYPE_DICT, CONFIG_VERSION, Config_key
 
-CONFIG_DEFAULT_DICT: dict[Config_key, str | bool] = {
+CONFIG_DEFAULT_DICT: dict[Config_key, str | bool | list[str]] = {
     Config_key.language: "auto",
     Config_key.check_update: True,
     Config_key.check_dependent: True,
-    Config_key.startup_directory: "",
+    Config_key.startup_dir: "",
+    Config_key.startup_dir_blacklist: [],
     Config_key.force_log_file_path: "",
     Config_key.log_print_level: log.LogLevel.send.name,
     Config_key.log_write_level: log.LogLevel.send.name,
-    Config_key.prompt_history_save_file: True,
+    Config_key.save_prompt_history: True,
 }
 
+assert all(k in CONFIG_DEFAULT_DICT for k in Config_key), [
+    k.name for k in Config_key if k not in CONFIG_DEFAULT_DICT
+]
+
 
 class config:
     _config_dir: Path
@@ -32,8 +39,8 @@ class config:
         if not cls._config_file.is_file():
             cls._config_dir.mkdir(exist_ok=True)
             with cls._config_file.open("wt", encoding="utf-8", newline="\n") as f:
-                config_default_dict: dict[str, str | bool] = {
-                    k.value: v for k, v in CONFIG_DEFAULT_DICT.items()
+                config_default_dict: dict[str, str | bool | list[str]] = {
+                    k.name: v for k, v in CONFIG_DEFAULT_DICT.items()
                 }
                 json.dump(
                     {
@@ -104,7 +111,11 @@ class config:
             return True
 
     @classmethod
-    def set_user_profile(cls, key: str, val: str | int | float | bool) -> bool:
+    def set_user_profile(
+        cls,
+        key: str,
+        val: str | bool | list[str],
+    ) -> bool:
         if cls._config is None and not cls._read_config():
             return False
 
@@ -113,21 +124,71 @@ class config:
             return False
 
         if "user_profile" not in cls._config:
-            log.error("User profile is not found in config")
+            log.error("User profile is not found in config file")
             return False
 
-        if key in Config_key:
+        if key in Config_key._member_map_:
+            need_type = CONFIG_TYPE_DICT[Config_key[key]]
+            if not type_match(val, need_type):
+                log.error(
+                    "Type mismatch: need '{}'",
+                    need_type if get_origin(need_type) else need_type.__name__,
+                )
+                return False
             cls._config["user_profile"][key] = val
         else:
             log.error("Key '{}' is not found in user profile", key)
             return False
         return cls._write_config()
 
+    @overload
+    @classmethod
+    def get_user_profile(
+        cls,
+        config_key: Literal[
+            Config_key.language,
+            Config_key.startup_dir,
+            Config_key.force_log_file_path,
+            Config_key.log_print_level,
+            Config_key.log_write_level,
+        ],
+    ) -> str | None: ...
+
+    @overload
+    @classmethod
+    def get_user_profile(
+        cls,
+        config_key: Literal[
+            Config_key.check_update,
+            Config_key.check_dependent,
+            Config_key.save_prompt_history,
+        ],
+    ) -> bool | None: ...
+
+    @overload
     @classmethod
     def get_user_profile(
-        cls, config_key: Config_key | str
-    ) -> str | int | float | bool | None:
-        key = config_key.value if isinstance(config_key, Config_key) else config_key
+        cls,
+        config_key: Literal[Config_key.startup_dir_blacklist],
+    ) -> list[str] | None: ...
+
+    @overload
+    @classmethod
+    def get_user_profile(
+        cls,
+        config_key: str,
+    ) -> str | bool | list[str] | None: ...
+
+    @classmethod
+    def get_user_profile(
+        cls,
+        config_key: Config_key | str,
+    ) -> str | bool | list[str] | None:
+        key = config_key.name if isinstance(config_key, Config_key) else config_key
+
+        if key not in Config_key._member_map_:
+            log.error("The key '{}' is not a config", key)
+            return None
 
         if cls._config is None:
             cls._read_config()
@@ -161,43 +222,47 @@ class config:
     def _get_config_about(cls, key: str) -> str:
         return (
             {
-                Config_key.language.value: gettext(
+                Config_key.language.name: gettext(
                     "Easy Rip's language, support incomplete matching. Default: {}. Supported: {}",
                     CONFIG_DEFAULT_DICT[Config_key.language],
                     ", ".join(("auto", *(str(tag) for tag in all_supported_lang_map))),
                 ),
-                Config_key.check_update.value: gettext(
+                Config_key.check_update.name: gettext(
                     "Auto check the update of Easy Rip. Default: {}",
                     CONFIG_DEFAULT_DICT[Config_key.check_update],
                 ),
-                Config_key.check_dependent.value: gettext(
+                Config_key.check_dependent.name: gettext(
                     "Auto check the versions of all dependent programs. Default: {}",
                     CONFIG_DEFAULT_DICT[Config_key.check_dependent],
                 ),
-                Config_key.startup_directory.value: gettext(
+                Config_key.startup_dir.name: gettext(
                     "Program startup directory, when the value is empty, starts in the working directory. Default: {}",
-                    CONFIG_DEFAULT_DICT[Config_key.startup_directory] or '""',
+                    CONFIG_DEFAULT_DICT[Config_key.startup_dir] or '""',
+                ),
+                Config_key.startup_dir_blacklist.name: gettext(
+                    "Directory list. When the startup directory is a blacklisted directory, rollback to startup directory. Default: {}",
+                    CONFIG_DEFAULT_DICT[Config_key.startup_dir] or '""',
                 ),
-                Config_key.force_log_file_path.value: gettext(
+                Config_key.force_log_file_path.name: gettext(
                     "Force change of log file path, when the value is empty, it is the working directory. Default: {}",
                     CONFIG_DEFAULT_DICT[Config_key.force_log_file_path] or '""',
                 ),
-                Config_key.log_print_level.value: gettext(
+                Config_key.log_print_level.name: gettext(
                     "Logs this level and above will be printed, and if the value is '{}', they will not be printed. Default: {}. Supported: {}",
                     log.LogLevel.none.name,
                     CONFIG_DEFAULT_DICT[Config_key.log_print_level],
                     ", ".join(log.LogLevel._member_names_),
                 ),
-                Config_key.log_write_level.value: gettext(
+                Config_key.log_write_level.name: gettext(
                     "Logs this level and above will be written, and if the value is '{}', the '{}' only be written when 'server', they will not be written. Default: {}. Supported: {}",
                     log.LogLevel.none.name,
                     log.LogLevel.send.name,
                     CONFIG_DEFAULT_DICT[Config_key.log_write_level],
                     ", ".join(log.LogLevel._member_names_),
                 ),
-                Config_key.prompt_history_save_file.value: gettext(
+                Config_key.save_prompt_history.name: gettext(
                     "Save prompt history to config directory, otherwise save to memory. Take effect after reboot. Default: {}",
-                    CONFIG_DEFAULT_DICT[Config_key.prompt_history_save_file],
+                    CONFIG_DEFAULT_DICT[Config_key.save_prompt_history],
                 ),
             }
             | (cls._config or {})

easyrip-4.6.1/easyrip/easyrip_config/config_key.py

@@ -0,0 +1,28 @@
+import enum
+
+CONFIG_VERSION = "4.6.0"
+
+
+class Config_key(enum.Enum):
+    language = enum.auto()
+    check_update = enum.auto()
+    check_dependent = enum.auto()
+    startup_dir = enum.auto()
+    startup_dir_blacklist = enum.auto()
+    force_log_file_path = enum.auto()
+    log_print_level = enum.auto()
+    log_write_level = enum.auto()
+    save_prompt_history = enum.auto()
+
+
+CONFIG_TYPE_DICT: dict[Config_key, type] = {
+    Config_key.language: str,
+    Config_key.check_update: bool,
+    Config_key.check_dependent: bool,
+    Config_key.startup_dir: str,
+    Config_key.startup_dir_blacklist: list[str],
+    Config_key.force_log_file_path: str,
+    Config_key.log_print_level: str,
+    Config_key.log_write_level: str,
+    Config_key.save_prompt_history: bool,
+}

{easyrip-4.5.1 → easyrip-4.6.1}/easyrip/easyrip_main.py

@@ -1,3 +1,4 @@
+import ast
 import ctypes
 import itertools
 import json
@@ -58,16 +59,15 @@ def log_new_ver(
             log.info(
                 "\n"
                 + gettext(
-                    "{} has new version {}. You can download it: {}",
+                    "{} has new version ({} -> {}). Suggest upgrading it: {}",
                     program_name,
+                    old_ver,
                     new_ver,
                     dl_url,
                 )
             )
-            # print(get_input_prompt(True), end="")
     except Exception as e:
         log.warning(f"\n{e}", is_format=False, deep=True)
-        # print(get_input_prompt(True), end="")
 
 
 def check_env() -> None:
@@ -185,20 +185,6 @@ def check_env() -> None:
                         _url,
                     )
 
-            # _name, _url = "MediaInfo", "https://mediaarea.net/en/MediaInfo/Download"
-            # if not shutil.which(_name):
-            #     log.warning(
-            #         "\n"
-            #         + gettext(
-            #             "{} not found, download it: {}", _name, f"(CLI ver) {_url}"
-            #         )
-            #     )
-            #     log.print(get_input_prompt(), end="")
-            # elif not subprocess.run(
-            #     "mediainfo --version", capture_output=True, text=True
-            # ).stdout:
-            #     log.error("The MediaInfo must be CLI ver")
-
         if config.get_user_profile(Config_key.check_update):
             log_new_ver(
                 easyrip_web.github.get_latest_release_ver(
@@ -208,18 +194,20 @@ def check_env() -> None:
                 PROJECT_NAME,
                 f"{global_val.PROJECT_URL}\n{
                     gettext(
-                        'or run this command to update using pip: {}',
-                        f'{sys.executable + " -m " if sys.executable[-10:].lower() == "python.exe" else ""}pip install -U easyrip',
+                        'Suggest running the following command to upgrade using pip: {}',
+                        f'{f'"{sys.executable}" -m ' if sys.executable.lower().endswith("python.exe") else ""}pip install -U easyrip',
                     )
                 }",
             )
 
-        # sys.stdout.flush()
-        # sys.stderr.flush()
         change_title(PROJECT_TITLE)
 
     except Exception as e:
-        log.error(f"The def check_env error: {e!r} {e}", deep=True)
+        log.error(
+            f"The function {check_env.__name__} error: {e!r} {e}",
+            is_format=False,
+            deep=True,
+        )
 
 
 def get_input_prompt(is_color: bool = False) -> str:
@@ -685,25 +673,16 @@ def run_command(command: Iterable[str] | str) -> bool:
                 case "set":
                     _key = cmd_list[2]
                     _val = cmd_list[3]
-                    _old_val = config.get_user_profile(_key)
+
+                    if (_old_val := config.get_user_profile(_key)) is None:
+                        return False
 
                     try:
-                        _val = float(_val)
-                    except ValueError:
-                        match _val:
-                            case "true" | "True":
-                                _val = True
-                            case "false" | "False":
-                                _val = False
-                    else:
-                        if (_val_int := int(_val)) == _val:
-                            _val = _val_int
+                        _val = ast.literal_eval(_val)
+                    except (ValueError, SyntaxError):
+                        pass
 
-                    if (
-                        (_old_val is _val)
-                        if isinstance(_val, bool) or isinstance(_old_val, bool)
-                        else (_old_val == _val)
-                    ):
+                    if _old_val == _val:
                         log.info(
                             "The new value is the same as the old value, cancel the modification",
                         )
@@ -1102,7 +1081,7 @@ def init(is_first_run: bool = False) -> None:
 
     # 设置日志文件路径名
     log.html_filename = gettext("encoding_log.html")
-    if _path := str(config.get_user_profile("force_log_file_path") or ""):
+    if _path := str(config.get_user_profile(Config_key.force_log_file_path) or ""):
         log.html_filename = os.path.join(_path, log.html_filename)
 
     # 设置日志级别
@@ -1119,8 +1098,18 @@ def init(is_first_run: bool = False) -> None:
     if is_first_run:
         # 设置启动目录
         try:
-            if _path := str(config.get_user_profile(Config_key.startup_directory)):
-                os.chdir(_path)
+            if _startup_dir := config.get_user_profile(Config_key.startup_dir):
+                if _startup_dir_blacklist := config.get_user_profile(
+                    Config_key.startup_dir_blacklist
+                ):
+                    if any(
+                        Path.cwd().samefile(d)
+                        for d in map(Path, _startup_dir_blacklist)
+                        if d.is_dir()
+                    ):
+                        os.chdir(_startup_dir)
+                else:
+                    os.chdir(_startup_dir)
         except Exception as e:
             log.error(f"{e!r} {e}", deep=True)
 

{easyrip-4.5.1 → easyrip-4.6.1}/easyrip/easyrip_mlang/lang_zh_Hans_CN.py

@@ -273,7 +273,7 @@ LANG_MAP: dict[str, str] = {
         "例如 -p subset 或 -p copy"
     ),
     # utils
-    "{} has new version {}. You can download it: {}": "检测到 {} 有新版本 {}。可在此下载: {}",
+    "{} has new version ({} -> {}). Suggest upgrading it: {}": "检测到 {} 有新版本 ({} -> {})。建议更新: {}",
     "{} not found, download it: {}": "没找到 {}, 在此下载: {}",
     "flac ver ({}) must >= 1.5.0": "flac 版本 ({}) 必须 >= 1.5.0",
     # main
@@ -303,7 +303,7 @@ LANG_MAP: dict[str, str] = {
     "There is no audio stream in the video, so '-c:a' cannot be used": "视频中没有音频流，所以无法使用 '-c:a'",
     "Unsupported '{}' param: {}": "'{}' 不支持此参数: {}",
     "Manually force exit": "手动强制退出",
-    "or run this command to update using pip: {}": "或运行以下命令以使用 pip 更新: {}",
+    "Suggest running the following command to upgrade using pip: {}": "建议运行以下命令以使用 pip 更新: {}",
     "Wrong sec in -shutdown, change to default 60s": "-shutdown 设定的秒数错误, 改为默认值 60s",
     "Current work directory has an other Easy Rip is running: {}": "当前工作目录存在其他 Easy Rip 正在运行: {}",
     "Stop run command": "命令执行终止",
@@ -346,7 +346,8 @@ LANG_MAP: dict[str, str] = {
     "Config data is not found": "配置文件数据不存在",
     "User profile is not found, regenerate config": "用户配置文件不存在, 重新生成配置",
     "User profile is not a valid dictionary": "用户配置文件不是有效的字典",
-    "User profile is not found": "用户配置文件不存在",
+    "User profile is not found in config file": "用户配置文件不存在于配置文件",
+    "Type mismatch: need '{}'": "类型不匹配: 需要 '{}'",
     "Key '{}' is not found in user profile": "用户配置文件中不存在 {}",
     "Save prompt history to config directory, otherwise save to memory. Take effect after reboot. Default: {}": "将 prompt 历史保存到 config 目录，否则保存到内存。重启后生效。默认: {}",
     # config about

{easyrip-4.5.1 → easyrip-4.6.1}/easyrip/global_val.py

@@ -3,7 +3,7 @@ import sys
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.5.1"
+PROJECT_VERSION = "4.6.1"
 PROJECT_TITLE = f"{PROJECT_NAME} v{PROJECT_VERSION}"
 PROJECT_URL = "https://github.com/op200/EasyRip"
 PROJECT_RELEASE_API = "https://api.github.com/repos/op200/EasyRip/releases/latest"

{easyrip-4.5.1 → easyrip-4.6.1}/easyrip/ripper/sub_and_font/font.py

@@ -55,7 +55,7 @@ def load_fonts(
     for file in path.iterdir() if path.is_dir() else (path,):
         if not (
             file.is_file()
-            and ((suffix := file.suffix.lower()) in {".ttf", ".otf", ".ttc"})
+            and (suffix := file.suffix.lower()) in {".ttf", ".otf", ".ttc"}
         ):
             continue
 
@@ -120,7 +120,7 @@ def load_fonts(
                 if is_regular:
                     if is_bold or is_italic:
                         log.error(
-                            "Font {} is Regular but Bold={} and Italic={}. Skip this font",
+                            'Font "{}" is Regular but Bold={} and Italic={}. Skip this font',
                             file,
                             is_bold,
                             is_italic,
@@ -134,15 +134,15 @@ def load_fonts(
                 else:
                     res_font.font_type = Font_type.Regular
                     log.warning(
-                        f"Font {file} does not have an English subfamily name. Defaulting to Regular"
+                        f'Font "{file}" does not have an English subfamily name. Defaulting to Regular'
                     )
 
                 res_font_list.append(res_font)
 
         except TTLibError as e:
-            log.error(f'Error loading font file "{file}": {e}')
+            log.error(f'Failed to load font file "{file}": {e}')
         except Exception as e:
-            log.error(f"Unexpected error for font {file}: {e}")
+            log.error(f'Unexpected error when load font "{file}": {e}')
 
     return res_font_list
 

{easyrip-4.5.1 → easyrip-4.6.1}/easyrip/utils.py

@@ -7,7 +7,7 @@ import sys
 import time
 from itertools import zip_longest
 from pathlib import Path
-from typing import Final
+from typing import Any, Final, TypeGuard, get_args, get_origin
 
 from Crypto.Cipher import AES as CryptoAES
 from Crypto.Util.Padding import pad, unpad
@@ -207,3 +207,82 @@ def time_str_to_sec(s: str) -> float:
 def non_ascii_str_len(s: str) -> int:
     """非 ASCII 字符算作 2 宽度"""
     return sum(2 - int(ord(c) < 256) for c in s)
+
+
+def type_match[T](val: Any, t: type[T]) -> TypeGuard[T]:
+    """
+    检查值是否匹配给定的类型（支持泛型）
+
+    支持的类型包括：
+    - 基本类型: int, str, list, dict, tuple, set
+    - 泛型类型: list[str], dict[str, int], tuple[int, ...]
+    - 联合类型: int | str, Union[int, str]
+    - 可选类型: Optional[str]
+    - 嵌套泛型: list[list[str]], dict[str, list[int]]
+
+    Args:
+        val: 要检查的值
+        t: 目标类型，可以是普通类型或泛型
+
+    Returns:
+        bool: 值是否匹配目标类型
+
+    """
+    t_org = get_origin(t)
+
+    # 如果不是泛型类型，直接使用 isinstance
+    if t_org is None:
+        return isinstance(val, t)
+
+    # 首先检查是否是 b_org 的实例
+    if not isinstance(val, t_org):
+        return False
+
+    # 获取类型参数
+    args = get_args(t)
+    if not args:  # 没有类型参数，如 List
+        return True
+
+    # 根据不同的原始类型进行检查
+    if t_org is list:
+        # list[T] 检查
+        if len(args) == 1:
+            elem_type = args[0]
+            return all(type_match(item, elem_type) for item in val)
+
+    elif t_org is tuple:
+        # tuple[T1, T2, ...] 或 tuple[T, ...] 检查
+        if len(args) == 2 and args[1] is ...:  # 可变长度元组
+            elem_type = args[0]
+            return all(type_match(item, elem_type) for item in val)
+        # 固定长度元组
+        if len(val) != len(args):
+            return False
+        return all(type_match(item, t) for item, t in zip(val, args, strict=False))
+
+    elif t_org is dict:
+        # dict[K, V] 检查
+        if len(args) == 2:
+            key_type, value_type = args
+            return all(
+                type_match(k, key_type) and type_match(v, value_type)
+                for k, v in val.items()
+            )
+
+    elif t_org is set:
+        # set[T] 检查
+        if len(args) == 1:
+            elem_type = args[0]
+            return all(type_match(item, elem_type) for item in val)
+
+    elif t_org is frozenset:
+        # frozenset[T] 检查
+        if len(args) == 1:
+            elem_type = args[0]
+            return all(type_match(item, elem_type) for item in val)
+
+    elif hasattr(t_org, "__name__") and t_org.__name__ == "Union":
+        # Union[T1, T2, ...] 或 T1 | T2 检查
+        return any(type_match(val, t) for t in args)
+
+    return True

{easyrip-4.5.1 → easyrip-4.6.1}/easyrip.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easyrip
-Version: 4.5.1
+Version: 4.6.1
 Author: op200
 License-Expression: AGPL-3.0-or-later
 Project-URL: Homepage, https://github.com/op200/EasyRip

easyrip-4.5.1/easyrip/easyrip_config/config_key.py

@@ -1,14 +0,0 @@
-import enum
-
-CONFIG_VERSION = "4.2.0"
-
-
-class Config_key(enum.Enum):
-    language = "language"
-    check_update = "check_update"
-    check_dependent = "check_dependent"
-    startup_directory = "startup_directory"
-    force_log_file_path = "force_log_file_path"
-    log_print_level = "log_print_level"
-    log_write_level = "log_write_level"
-    prompt_history_save_file = "prompt_history_file"