easyrip 4.14.0__py3-none-any.whl → 4.15.0__py3-none-any.whl

easyrip/__main__.py

@@ -6,6 +6,8 @@ import Crypto
 import fontTools
 import prompt_toolkit
 from prompt_toolkit import ANSI, prompt
+from prompt_toolkit.application import get_app
+from prompt_toolkit.clipboard.pyperclip import PyperclipClipboard
 from prompt_toolkit.completion import merge_completers
 from prompt_toolkit.history import InMemoryHistory
 from prompt_toolkit.input.ansi_escape_sequences import ANSI_SEQUENCES
@@ -49,8 +51,22 @@ def run() -> NoReturn:
 
     @key_bindings.add(Keys.ControlC)
     def _(event: KeyPressEvent) -> None:
+        buffer = event.app.current_buffer
+
+        # 检查是否有选中的文本
+        if buffer.selection_state is not None:
+            get_app().clipboard.set_data(buffer.copy_selection())
+            return
+
         event.app.exit(exception=KeyboardInterrupt, style="class:exiting")
 
+    @key_bindings.add(Keys.ControlA)
+    def _(event: KeyPressEvent) -> None:
+        buff = event.app.current_buffer
+        buff.cursor_position = 0
+        buff.start_selection()
+        buff.cursor_position = len(buff.text)
+
     @key_bindings.add(Keys.ControlD)
     def _(event: KeyPressEvent) -> None:
         event.app.current_buffer.insert_text(C_D)
@@ -64,6 +80,7 @@ def run() -> NoReturn:
         return named_commands.get_by_name("unix-word-rubout").handler(event)
 
     path_completer = SmartPathCompleter()
+    clipboard = PyperclipClipboard()
 
     def _ctv_to_nc(ctvs: Iterable[Cmd_type_val]) -> CmdCompleter:
         return CmdCompleter(
@@ -138,6 +155,7 @@ def run() -> NoReturn:
                 ),
                 history=prompt_history,
                 complete_while_typing=True,
+                clipboard=clipboard,
             )
             if command.startswith(C_Z):
                 raise EOFError

easyrip/easyrip_command.py

@@ -664,6 +664,15 @@ class Opt_type(enum.Enum):
         ),
         childs=(Cmd_type_val(("0", "1")),),
     )
+    _quality_detection = Cmd_type_val(
+        ("-quality-detection",),
+        param="<algorithm>[:<threshold>]",
+        description=(
+            "Comparison of quality between detection and source after encoding is completed\n"
+            "Algorithm: ssim psnr vmaf"
+        ),
+        childs=(Cmd_type_val(("ssim", "psnr", "vmaf")),),
+    )
 
     @classmethod
     def from_str(cls, s: str) -> Self | None:

easyrip/easyrip_mlang/lang_zh_Hans_CN.py

@@ -328,7 +328,7 @@ LANG_MAP: dict[str, str] = {
     "There have error in running": "执行时出错",
     "{} param illegal": "{} 参数非法",
     'The file "{}" already exists, skip translating it': '文件 "{}" 已存在, 跳过翻译',
-    "Subset faild, cancel mux": "子集化失败, 取消混流",
+    "Subset failed, cancel mux": "子集化失败, 取消混流",
     "FFmpeg report: {}": "FFmpeg 报告: {}",
     "{} not found. Skip it": "没找到 {}。默认跳过",
     "{} not found. Skip it. Perhaps you want the {}": "没找到 {}。默认跳过。或许你想要的是 {}",

easyrip/easyrip_web/third_party_api.py

@@ -120,7 +120,7 @@ class mkvtoolnix:
                     log.debug(
                         "'{}' execution failed: {}",
                         f"{cls.__name__}.{cls.get_latest_release_ver.__name__}",
-                        f"XML parse faild: {xml.etree.ElementTree.tostring(xml_tree)}",
+                        f"XML parse failed: {xml.etree.ElementTree.tostring(xml_tree)}",
                         print_level=log.LogLevel._detail,
                     )
                     return None

easyrip/global_val.py

@@ -4,7 +4,7 @@ from functools import cache
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.14.0"
+PROJECT_VERSION = "4.15.0"
 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/ripper/media_info.py

@@ -120,7 +120,7 @@ class Media_info:
             sample_fmt = _audio_info_dict.get("sample_fmt")
             if sample_fmt is None:
                 log.debug(
-                    'Faild to get audio info: {}. file "{}" track index {}',
+                    'Failed to get audio info: {}. file "{}" track index {}',
                     "sample_fmt",
                     path,
                     index,
@@ -130,7 +130,7 @@ class Media_info:
             sample_rate = _audio_info_dict.get("sample_rate")
             if sample_rate is None:
                 log.debug(
-                    'Faild to get audio info: {}. file "{}" track index {}',
+                    'Failed to get audio info: {}. file "{}" track index {}',
                     "sample_rate",
                     path,
                     index,
@@ -140,7 +140,7 @@ class Media_info:
             bits_per_sample = _audio_info_dict.get("bits_per_sample")
             if bits_per_sample is None:
                 log.debug(
-                    'Faild to get audio info: {}. file "{}" track index {}',
+                    'Failed to get audio info: {}. file "{}" track index {}',
                     "bits_per_sample",
                     path,
                     index,
@@ -150,7 +150,7 @@ class Media_info:
             bits_per_raw_sample = _audio_info_dict.get("bits_per_raw_sample")
             if bits_per_raw_sample is None:
                 log.debug(
-                    'Faild to get audio info: {}. file "{}" track index {}',
+                    'Failed to get audio info: {}. file "{}" track index {}',
                     "bits_per_raw_sample",
                     path,
                     index,

easyrip/ripper/ripper.py

@@ -1,3 +1,4 @@
+import csv
 import os
 import re
 import shutil
@@ -14,7 +15,7 @@ from typing import Final, Self, final
 from .. import easyrip_web
 from ..easyrip_log import log
 from ..easyrip_mlang import Global_lang_val, gettext, translate_subtitles
-from ..utils import get_base62_time
+from ..utils import get_base62_time, read_text
 from .media_info import Media_info, Stream_error
 from .param import (
     FONT_SUFFIX_SET,
@@ -1088,9 +1089,15 @@ class Ripper:
             f'{gettext("Encoding speed")}: <span style="color:darkcyan;">{speed}</span><br>'
         )
 
+        # 获取 ffmpeg report 中的报错
+        if FF_REPORT_LOG_FILE.is_file():
+            with FF_REPORT_LOG_FILE.open("rt", encoding="utf-8") as file:
+                for line in file.readlines()[2:]:
+                    log.warning("FFmpeg report: {}", line)
+
         if is_cmd_run_failed:
             log.error("There have error in running")
-        else:  # 多文件合成
+        else:  # 多文件合成 or 后处理
             # flac 音频轨合成
             if (
                 self.preset_name != Ripper.Preset_name.flac
@@ -1245,16 +1252,133 @@ class Ripper:
                     ).run() and os.path.exists(new_full_name):
                         os.remove(new_full_name)
                 else:
-                    log.error("Subset faild, cancel mux")
+                    log.error("Subset failed, cancel mux")
 
                 # 清理临时文件
                 shutil.rmtree(subset_folder)
 
-        # 获取 ffmpeg report 中的报错
-        if FF_REPORT_LOG_FILE.is_file():
-            with FF_REPORT_LOG_FILE.open("rt", encoding="utf-8") as file:
-                for line in file.readlines()[2:]:
-                    log.warning("FFmpeg report: {}", line)
+            # 画质检测
+            if quality_detection := self.option_map.get("quality-detection"):
+                quality_detection = quality_detection.split(":")
+                quality_detection_th: float
+                quality_detection_filter: str
+                while True:
+                    match quality_detection[0]:
+                        case "ssim":
+                            quality_detection_th = 0.9
+                            quality_detection_filter = "ssim=f="
+
+                            def quality_detection_cmp(
+                                text: str, threshold: float
+                            ) -> None:
+                                for line in text.splitlines():
+                                    values = tuple(
+                                        s.split(":")[1] for s in line.split()[:-1]
+                                    )
+                                    ssim_all = float(values[-1])
+                                    n = values[0]
+                                    log.debug(
+                                        f"{n}: {ssim_all}",
+                                        is_format=False,
+                                        print_level=log.LogLevel._detail,
+                                    )
+                                    if ssim_all < threshold:
+                                        log.error(
+                                            "SSIM {} < threshold {} in frame {}",
+                                            ssim_all,
+                                            threshold,
+                                            n,
+                                        )
+
+                            break
+                        case "psnr":
+                            quality_detection_th = 30
+                            quality_detection_filter = "psnr=f="
+
+                            def quality_detection_cmp(
+                                text: str, threshold: float
+                            ) -> None:
+                                for line in text.splitlines():
+                                    values = tuple(
+                                        s.split(":")[1] for s in line.split()
+                                    )
+                                    psnr_avg_all = float(values[-4])
+                                    n = values[0]
+                                    log.debug(
+                                        f"{n}: {psnr_avg_all}",
+                                        is_format=False,
+                                        print_level=log.LogLevel._detail,
+                                    )
+                                    if psnr_avg_all < threshold:
+                                        log.error(
+                                            "PSNR {} < threshold {} in frame {}",
+                                            psnr_avg_all,
+                                            threshold,
+                                            n,
+                                        )
+
+                            break
+                        case "vmaf":
+                            quality_detection_th = 80
+                            quality_detection_filter = "libvmaf=log_fmt=csv:log_path="
+
+                            def quality_detection_cmp(
+                                text: str, threshold: float
+                            ) -> None:
+                                for line in tuple(csv.reader(text))[1:]:
+                                    vmaf = float(line[-1])
+                                    n = int(line[0]) + 1
+                                    log.debug(
+                                        f"{n}: {vmaf}",
+                                        is_format=False,
+                                        print_level=log.LogLevel._detail,
+                                    )
+                                    if vmaf < threshold:
+                                        log.error(
+                                            "VMAF {} < threshold {} in frame {}",
+                                            vmaf,
+                                            threshold,
+                                            n,
+                                        )
+
+                            break
+                        case _:
+                            log.error(
+                                "Param error from '{}': {}",
+                                "-quality-detection",
+                                f"{quality_detection[0]} -> ssim",
+                            )
+                            quality_detection[0] = "ssim"
+
+                if len(quality_detection) > 1:
+                    try:
+                        quality_detection_th = float(quality_detection[1])
+                    except ValueError as e:
+                        log.error("Param error from '{}': {}", "-quality-detection", e)
+
+                quality_detection_data_file: Path = Path(
+                    self.output_dir, "quality_detection_data.log"
+                )
+                quality_detection_data_file_filter_str: str = (
+                    str(quality_detection_data_file)
+                    .replace("\\", "/")
+                    .replace(":", "\\\\:")
+                )
+                if os.system(
+                    f'ffmpeg -i "{self.input_path_list[0]}" -i "{os.path.join(self.output_dir, temp_name)}" -lavfi "{quality_detection_filter}{quality_detection_data_file_filter_str}" -f null -'
+                ):
+                    log.error("Run {} failed", "-quality-detection")
+                else:
+                    log.debug(
+                        "'{}' start: {}",
+                        "-quality-detection",
+                        f"{quality_detection[0]}:{quality_detection_th}",
+                    )
+                    quality_detection_cmp(
+                        read_text(quality_detection_data_file), quality_detection_th
+                    )
+                    log.debug("'{}' end", "-quality-detection")
+                quality_detection_data_file.unlink(missing_ok=True)
 
         # 获取体积
         temp_name_full = os.path.join(self.output_dir, temp_name)

{easyrip-4.14.0.dist-info → easyrip-4.15.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easyrip
-Version: 4.14.0
+Version: 4.15.0
 Author: op200
 License-Expression: AGPL-3.0-or-later
 Project-URL: Homepage, https://github.com/op200/EasyRip
@@ -20,6 +20,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: pyperclip>=1.11.0
 Requires-Dist: prompt-toolkit>=3.0.52
 Requires-Dist: fonttools>=4.61.1
 Requires-Dist: pycryptodome>=3.23.0

{easyrip-4.14.0.dist-info → easyrip-4.15.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 easyrip/__init__.py,sha256=DULQoFEAEHYk7dS8Zxky56so7qDPqHm7jUc_Zop1eXw,616
-easyrip/__main__.py,sha256=AEYyrxi1iUR7nEU7zln8JEHmetjhLqOue4VhFZFR5gI,5158
-easyrip/easyrip_command.py,sha256=1_CbICn_4U6xKEt0TCU753Oa2wC7_1966IoKNIdJoWI,30303
+easyrip/__main__.py,sha256=RmJ2_bFzJmyymKnJpTqrbQc64tjK-ziGEen8sGsMm8c,5791
+easyrip/easyrip_command.py,sha256=ZEQ8v8FHaSB7tKKMv0HY0NXOftR1S3gRaPTslfxc9tk,30650
 easyrip/easyrip_log.py,sha256=R-dM3CWUBFITtG7GSD1zy4X4MhZqxkoiBPjlIpI76cY,15573
 easyrip/easyrip_main.py,sha256=9KMpKUal8ApWZr80AQ7UwO1n6HUSWeVo2SuJ4pMW1f8,48130
 easyrip/easyrip_prompt.py,sha256=TOmRJDigGRz7wRWFNakJdfNI1tn9vGekq6FH5ypmQfA,7068
-easyrip/global_val.py,sha256=DRe2CSZP2HEBCcvEUVQRQLqR9_AfEQx-rQiYyjp7-NM,866
+easyrip/global_val.py,sha256=Q6PBQ8iB8H7cJN5KRaLBAj8mHdGCj47EAiLzW62cSrg,866
 easyrip/utils.py,sha256=N1rMF1MyoC-YFBgy10_u29cFoowfhR-5Viea93O7wQ4,8750
 easyrip/easyrip_config/config.py,sha256=KWXZMEYxdXYUGLQ-MR0A7nnOwR6QZdVrWBopfb2QZSA,9869
 easyrip/easyrip_config/config_key.py,sha256=_jjdKOunskUoG7UUWOz3QZK-s4LF_x6hmM9MKttyS2Q,766
@@ -12,21 +12,21 @@ easyrip/easyrip_mlang/__init__.py,sha256=QqnL0kgV_trGPeLF5gawP1qAlj0GXUadLNhMSdK
 easyrip/easyrip_mlang/global_lang_val.py,sha256=pG9DxPl6vUOZoFHYQKCM-AM0TYWbd8L4S65CUQFPRh4,4998
 easyrip/easyrip_mlang/lang_en.py,sha256=fTM9ejuPW6gEfSMbnMEW-LzlUfvj0YGfoUfmHZpRzms,121
 easyrip/easyrip_mlang/lang_tag_val.py,sha256=Ec-U0XglpSYvmkHlcEBueSj8ocTLSTH3cacElAkmYVU,5184
-easyrip/easyrip_mlang/lang_zh_Hans_CN.py,sha256=uW6esedtSYi6Y4R4MA4Xkd2y3f-2O5-ywJFgogk1O7Y,19031
+easyrip/easyrip_mlang/lang_zh_Hans_CN.py,sha256=-GyAtjhSHqfR2x1mDgW3CdMz7odd58uJzONK67wow8g,19032
 easyrip/easyrip_mlang/translator.py,sha256=jlgZYSPHvwv1Pps3akKkSgVsGcLtV2psKaXyZH4QCbA,5870
 easyrip/easyrip_web/__init__.py,sha256=tMyEeaSGeEJjND7MF0MBv9aDiDgaO3MOnppwxA70U2c,177
 easyrip/easyrip_web/http_server.py,sha256=iyulCAFQrJlz86Lrr-Dm3fhOnNCf79Bp6fVHhr0ephY,8350
-easyrip/easyrip_web/third_party_api.py,sha256=GhP6LmR1sVMeLLbnj82r-QYjoUdSnyaU9xp0LRnRLsw,4623
-easyrip/ripper/media_info.py,sha256=mQq_vbQ7S9fWpb39HLkoZlAL-pqNfwxewv6X776Nf50,5078
+easyrip/easyrip_web/third_party_api.py,sha256=E-60yoY6D0pPUfYW1VIh0763htyV5z6getzlLtLAdQc,4624
+easyrip/ripper/media_info.py,sha256=KdSodS6nIp2BWEer5y4mD5xwyhP15_PgNRhz2fnHmw0,5082
 easyrip/ripper/param.py,sha256=PfJzJz9LPCB5hAM9G4GjPxdn_EZRgAz-vxYzuHGQLp8,13084
-easyrip/ripper/ripper.py,sha256=bymJVnEqQa3lTEiLJwRQpmfVctvP-2tLprCQ2XfH9Lk,52756
+easyrip/ripper/ripper.py,sha256=FkbOi1H_IQtcOmr1sMnRgZvPEnxkMvINV2EiFIjSIqI,58898
 easyrip/ripper/sub_and_font/__init__.py,sha256=cBT7mxL7RRFaJXFPXuZ7RT-YK6FbnanaU5v6U9BOquw,153
 easyrip/ripper/sub_and_font/ass.py,sha256=EhDkVY5JXU77euWPId7H2v85j444m8ZLm7wUid7TYd8,35307
 easyrip/ripper/sub_and_font/font.py,sha256=X2dPcPzbwQf3fv_g_mxO-zY7puVAX9Nv-9QHn88q4oA,7745
 easyrip/ripper/sub_and_font/subset.py,sha256=--rAA3VH1rm_jBOC3yMs3rOJpn3tPuvfXqkimbBtx3s,18653
-easyrip-4.14.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-easyrip-4.14.0.dist-info/METADATA,sha256=NiCk9-cdBcFFvcSrKArJmsZKCZheat4MnfPKmLkJ7zo,3507
-easyrip-4.14.0.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-easyrip-4.14.0.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
-easyrip-4.14.0.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
-easyrip-4.14.0.dist-info/RECORD,,
+easyrip-4.15.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+easyrip-4.15.0.dist-info/METADATA,sha256=EeTyI6jF0S972Q706cZggO-ffPg8Y7hUMUIF0uJWf00,3540
+easyrip-4.15.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+easyrip-4.15.0.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
+easyrip-4.15.0.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
+easyrip-4.15.0.dist-info/RECORD,,

{easyrip-4.14.0.dist-info → easyrip-4.15.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.10.1)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any