easyrip 4.11.1__tar.gz → 4.11.2__tar.gz

{easyrip-4.11.1 → easyrip-4.11.2}/PKG-INFO

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

{easyrip-4.11.1 → easyrip-4.11.2}/easyrip/easyrip_command.py

@@ -595,6 +595,21 @@ class Opt_type(enum.Enum):
         ("-hwaccel",),
         param="<string>",
         description="Use FFmpeg hwaccel (See 'ffmpeg -hwaccels' for details)",
+        childs=(
+            Cmd_type_val(
+                names=(
+                    "cuda",
+                    "vaapi",
+                    "dxva2",
+                    "qsv",
+                    "d3d11va",
+                    "opencl",
+                    "vulkan",
+                    "d3d12va",
+                    "amf",
+                )
+            ),
+        ),
     )
     _ss = Cmd_type_val(
         ("-ss",),
@@ -793,7 +808,7 @@ class OptCompleter(Completer):
 
         if (
             (opt_tree_pos_list[-1] is not self.opt_tree)
-            or (words[-1] in add_comp_words)
+            or (words and words[-1] in add_comp_words)
         ) and not text.endswith(" "):
             # 不在根(上个单词没让这个单词回退到根) or 匹配额外提示
             # 且尾部不是空格

{easyrip-4.11.1 → easyrip-4.11.2}/easyrip/easyrip_mlang/translator.py

@@ -42,20 +42,20 @@ def translate_subtitles(
 
     file_list: Final[list[tuple[Path, str]]] = []
     for f in directory.iterdir():
-        if f.suffix not in {".ass", ".ssa", ".srt"} or (
-            file_intersection_selector is not None
-            and f not in file_intersection_selector
+        if (
+            not f.is_file()
+            or f.suffix not in {".ass", ".ssa", ".srt"}
+            or (
+                file_intersection_selector is not None
+                and not all(map(f.samefile, file_intersection_selector))
+            )
         ):
             continue
 
-        if len(_stems := f.stem.split(".")) < 1:
-            continue
-        if infix == _stems[-1]:
+        if (_stems := f.stem.split(".")) and (infix == _stems[-1]):
             file_list.append(
                 (
-                    f.with_name(
-                        f"{'.'.join(f.stem.split('.')[:-1])}.{target_lang_tag}{f.suffix}"
-                    ),
+                    f.with_name(f"{'.'.join(_stems[:-1])}.{target_lang_tag}{f.suffix}"),
                     read_text(f),
                 )
             )

{easyrip-4.11.1 → easyrip-4.11.2}/easyrip/global_val.py

@@ -4,7 +4,7 @@ from functools import cache
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.11.1"
+PROJECT_VERSION = "4.11.2"
 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.11.1 → easyrip-4.11.2}/easyrip/ripper/param.py

@@ -434,7 +434,7 @@ DEFAULT_PRESET_PARAMS: Final[dict[Preset_name, dict[LiteralString, LiteralString
         {
             "crf": "17",
             "qpmin": "3",
-            "qpmax": "21.5",
+            "qpmax": "23",
             "psy-rd": "2.2",
             "rd": "5",
             "rdoq-level": "2",

{easyrip-4.11.1 → easyrip-4.11.2}/easyrip/ripper/ripper.py

@@ -802,11 +802,42 @@ class Ripper:
                     )
 
             case Ripper.Preset_name.subset:
+                # 临时翻译
+                add_tr_file_list: Final[list[Path]] = []
+                if translate_sub := self.option_map.get("translate-sub"):
+                    _tr = translate_sub.split(":")
+                    if len(_tr) != 2:
+                        log.error("{} param illegal", "-translate-sub")
+                    else:
+                        try:
+                            _file_list = translate_subtitles(
+                                Path(self.output_dir),
+                                _tr[0],
+                                _tr[1],
+                                file_intersection_selector=self.input_path_list,
+                            )
+                        except Exception as e:
+                            log.error(e, is_format=False)
+                        else:
+                            for f_and_s in _file_list:
+                                if f_and_s[0].is_file():
+                                    log.warning(
+                                        'The file "{}" already exists, skip translating it',
+                                        f_and_s[0],
+                                    )
+                                    continue
+
+                                with f_and_s[0].open(
+                                    "wt", encoding="utf-8-sig", newline="\n"
+                                ) as f:
+                                    f.write(f_and_s[1])
+                                    add_tr_file_list.append(f_and_s[0])
+
                 _output_dir = Path(self.output_dir) / basename
                 _output_dir.mkdir(parents=True, exist_ok=True)
 
-                _ass_list: list[Path] = []
-                _other_sub_list: list[Path] = []
+                _ass_list: Final[list[Path]] = add_tr_file_list.copy()
+                _other_sub_list: Final[list[Path]] = []
 
                 for path in self.input_path_list:
                     if path.suffix == ".ass":
@@ -861,6 +892,13 @@ class Ripper:
                 for path in _other_sub_list:
                     shutil.copy2(path, _output_dir / path.name)
 
+                # 清理临时文件
+                for f in add_tr_file_list:
+                    try:
+                        f.unlink()
+                    except Exception as e:
+                        log.error(f"{e!r} {e}", deep=True, is_format=False)
+
                 if subset_res is False:
                     log.error("Run {} failed", "subset")
                 return subset_res
@@ -1085,39 +1123,9 @@ class Ripper:
                     log.warning("-soft-sub is empty")
                 log.info("-soft-sub list = {}", soft_sub_list)
 
-                # 临时翻译
-                add_tr_files: Final[list[Path]] = []
-                if translate_sub := self.option_map.get("translate-sub"):
-                    _tr = translate_sub.split(":")
-                    if len(_tr) != 2:
-                        log.error("{} param illegal", "-translate-sub")
-                    else:
-                        try:
-                            _file_list = translate_subtitles(
-                                Path(self.output_dir),
-                                _tr[0],
-                                _tr[1],
-                                file_intersection_selector=soft_sub_list,
-                            )
-                        except Exception as e:
-                            log.error(e, is_format=False)
-                        else:
-                            for f_and_s in _file_list:
-                                if f_and_s[0].is_file():
-                                    log.warning(
-                                        'The file "{}" already exists, skip translating it',
-                                        f_and_s[0],
-                                    )
-                                    continue
-                                with f_and_s[0].open(
-                                    "wt", encoding="utf-8-sig", newline="\n"
-                                ) as f:
-                                    f.write(f_and_s[1])
-                                    add_tr_files.append(f_and_s[0])
-
                 # 子集化
                 if Ripper(
-                    soft_sub_list + add_tr_files,
+                    soft_sub_list,
                     (subset_folder.name,),
                     self.output_dir,
                     Ripper.Preset_name.subset,
@@ -1161,11 +1169,6 @@ class Ripper:
 
                 # 清理临时文件
                 shutil.rmtree(subset_folder)
-                for f in add_tr_files:
-                    try:
-                        f.unlink()
-                    except Exception as e:
-                        log.error(f"{e!r} {e}", deep=True, is_format=False)
 
         # 获取 ffmpeg report 中的报错
         if FF_REPORT_LOG_FILE.is_file():

{easyrip-4.11.1 → easyrip-4.11.2}/easyrip.egg-info/PKG-INFO

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