easyrip 4.15.2__py3-none-any.whl → 4.16.0__py3-none-any.whl

easyrip/easyrip_command.py

@@ -719,7 +719,7 @@ class Opt_type(enum.Enum):
             "Algorithm:"
         ),
         childs=(
-            Cmd_type_val(("ssim",), description="Default threshold: 0.9"),
+            Cmd_type_val(("ssim",), description="Default threshold: 0.85"),
             Cmd_type_val(("psnr",), description="Default threshold: 30"),
             Cmd_type_val(("vmaf",), description="Default threshold: 80"),
         ),

easyrip/easyrip_web/third_party_api.py

@@ -6,6 +6,20 @@ import urllib.request
 import xml.etree.ElementTree
 from time import sleep
 
+REQ_HEADER = {
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:147.0) Gecko/20100101 Firefox/147.0"
+}
+
+
+def open_req(req: urllib.request.Request):
+    from ..easyrip_log import log
+
+    proxies = urllib.request.getproxies()
+    log.debug("Proxies: {}", proxies, print_level=log.LogLevel._detail)
+    opener = urllib.request.build_opener(urllib.request.ProxyHandler(proxies))
+
+    return opener.open(req)
+
 
 class zhconvert:
     """繁化姬 API"""
@@ -42,11 +56,12 @@ class zhconvert:
             data=urllib.parse.urlencode(
                 {"text": org_text, "converter": target_lang.value}
             ).encode("utf-8"),
+            headers=REQ_HEADER,
         )
 
         for retry_num in range(5):
             try:
-                with urllib.request.urlopen(req) as response:
+                with open_req(req) as response:
                     for _ in range(5):  # 尝试重连
                         if response.getcode() != 200:
                             log.debug("response.getcode() != 200")
@@ -62,11 +77,11 @@ class zhconvert:
                         return text
 
                     raise Exception(f"HTTP error: {response.getcode()}")
-            except urllib.error.HTTPError:
+            except urllib.error.HTTPError as e:
                 sleep(0.5)
                 if retry_num == 4:
                     raise
-                log.debug("Attempt to reconnect")
+                log.debug("Attempt to reconnect: {}", e)
                 continue
 
         raise Exception
@@ -78,10 +93,13 @@ class github:
         """失败返回 None"""
         from ..easyrip_log import log
 
-        req = urllib.request.Request(release_api_url)
+        req = urllib.request.Request(
+            url=release_api_url,
+            headers=REQ_HEADER,
+        )
 
         try:
-            with urllib.request.urlopen(req) as response:
+            with open_req(req) as response:
                 data: dict = json.loads(response.read().decode("utf-8"))
                 ver = data.get("tag_name")
                 if ver is None:
@@ -111,10 +129,13 @@ class mkvtoolnix:
 
         from ..easyrip_log import log
 
-        req = urllib.request.Request("https://mkvtoolnix.download/latest-release.xml")
+        req = urllib.request.Request(
+            url="https://mkvtoolnix.download/latest-release.xml",
+            headers=REQ_HEADER,
+        )
 
         try:
-            with urllib.request.urlopen(req) as response:
+            with open_req(req) as response:
                 xml_tree = xml.etree.ElementTree.XML(response.read().decode("utf-8"))
                 if (ver := xml_tree.find("latest-source/version")) is None:
                     log.debug(

easyrip/global_val.py

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

@@ -8,6 +8,7 @@ from collections.abc import Callable, Iterable
 from dataclasses import dataclass
 from datetime import datetime
 from itertools import zip_longest
+from operator import itemgetter
 from pathlib import Path
 from threading import Thread
 from time import sleep
@@ -21,7 +22,7 @@ from ..easyrip_mlang import (
     gettext,
     translate_subtitles,
 )
-from ..utils import get_base62_time, read_text, type_match
+from ..utils import get_base62_time, type_match
 from .media_info import Media_info, Stream_error
 from .param import (
     FONT_SUFFIX_SET,
@@ -1305,30 +1306,23 @@ class Ripper:
                 while True:
                     match quality_detection[0]:
                         case "ssim":
-                            quality_detection_th = 0.9
+                            quality_detection_th = 0.85
                             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]
+                                text: str,
+                            ) -> list[tuple[str | int, float]]:
+                                return [
+                                    (n, q)
+                                    for line in text.splitlines()
+                                    if (
+                                        v := [
+                                            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,
-                                        )
+                                    and (q := float(v[-1]))
+                                    and (n := int(v[0]) - 1)
+                                ]
 
                             break
                         case "psnr":
@@ -1336,26 +1330,15 @@ class Ripper:
                             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,
-                                        )
+                                text: str,
+                            ) -> list[tuple[str | int, float]]:
+                                return [
+                                    (n, q)
+                                    for line in text.splitlines()
+                                    if (v := [s.split(":")[1] for s in line.split()])
+                                    and (q := float(v[-4]))
+                                    and (n := int(v[0]) - 1)
+                                ]
 
                             break
                         case "vmaf":
@@ -1363,23 +1346,13 @@ class Ripper:
                             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,
-                                        )
+                                text: str,
+                            ) -> list[tuple[str | int, float]]:
+                                return [
+                                    (n, q)
+                                    for v in tuple(csv.reader(text.splitlines()[1:]))
+                                    if (q := float(v[-2])) and (n := v[0])
+                                ]
 
                             break
                         case _:
@@ -1404,6 +1377,7 @@ class Ripper:
                     .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 -'
                 ):
@@ -1414,9 +1388,22 @@ class Ripper:
                         "-quality-detection",
                         f"{quality_detection[0]}:{quality_detection_th}",
                     )
-                    quality_detection_cmp(
-                        read_text(quality_detection_data_file), quality_detection_th
-                    )
+                    with quality_detection_data_file.open("rt", encoding="utf-8") as f:
+                        _res = quality_detection_cmp(f.read())
+                        for n, q in _res:
+                            if q < quality_detection_th:
+                                log.error(
+                                    "{} {} < threshold {} in frame {}",
+                                    quality_detection[0].upper(),
+                                    q,
+                                    quality_detection_th,
+                                    n,
+                                )
+                        log.info(
+                            "{} min = {}",
+                            quality_detection[0].upper(),
+                            min(map(itemgetter(1), _res)),
+                        )
                     log.debug("'{}' end", "-quality-detection")
                 quality_detection_data_file.unlink(missing_ok=True)
 

{easyrip-4.15.2.dist-info → easyrip-4.16.0.dist-info}/METADATA

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

{easyrip-4.15.2.dist-info → easyrip-4.16.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 easyrip/__init__.py,sha256=DULQoFEAEHYk7dS8Zxky56so7qDPqHm7jUc_Zop1eXw,616
 easyrip/__main__.py,sha256=oiDLhxR-o7dh6jAZMuiOX6RMX_LTFRMOhg16kR1dVZM,4743
-easyrip/easyrip_command.py,sha256=RfJMjlFIlFznxM2YyDkrlAoxbaJUC8xOZEkxvOUD1Pk,34010
+easyrip/easyrip_command.py,sha256=6j2EFg9PesESmPpDbxfs8mzLVTMwcEjj9xeuPfbq7B4,34011
 easyrip/easyrip_log.py,sha256=R-dM3CWUBFITtG7GSD1zy4X4MhZqxkoiBPjlIpI76cY,15573
 easyrip/easyrip_main.py,sha256=EjEjs1UCVSMGxdQ-XUggiDbZ0pOxiKcC85toNdbFTV4,48766
 easyrip/easyrip_prompt.py,sha256=OidVzSkBksC89HzDcvqGkF9CXyhPNINYDp1sgLarxf8,7087
-easyrip/global_val.py,sha256=imyOEDnS1dmIULjmq0UrwEcKBF7Bcb4ELybrsPws57s,866
+easyrip/global_val.py,sha256=AwfM4dmCupM8c_3c1INZ5KUZySFfbpBwVJ_ZOk_P4TI,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
@@ -16,17 +16,17 @@ easyrip/easyrip_mlang/lang_zh_Hans_CN.py,sha256=OuWg_sNEzNkvlF1EPMFDZrucfQ1Y92zK
 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=E-60yoY6D0pPUfYW1VIh0763htyV5z6getzlLtLAdQc,4624
+easyrip/easyrip_web/third_party_api.py,sha256=JJSkhqc1HGk2VFd90uH8bfOw0TxHOanMNp4jhhtk94s,5165
 easyrip/ripper/media_info.py,sha256=KdSodS6nIp2BWEer5y4mD5xwyhP15_PgNRhz2fnHmw0,5082
 easyrip/ripper/param.py,sha256=PfJzJz9LPCB5hAM9G4GjPxdn_EZRgAz-vxYzuHGQLp8,13084
-easyrip/ripper/ripper.py,sha256=qppP5D-4e4LYKemlsOvq8wTJwYBlPhEo7k2nhwKSQEs,60501
+easyrip/ripper/ripper.py,sha256=h2jZaysF8r8UB5jEJRA1gqS-L6N_IpsDvtBlEToRgYY,59555
 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.15.2.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-easyrip-4.15.2.dist-info/METADATA,sha256=vaOTNo3-DbhZBoHbfyfPnrcvR_C0qdl1j94LwGRu63Y,4061
-easyrip-4.15.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-easyrip-4.15.2.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
-easyrip-4.15.2.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
-easyrip-4.15.2.dist-info/RECORD,,
+easyrip-4.16.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+easyrip-4.16.0.dist-info/METADATA,sha256=IIR3XuhVQT62DjdPWwz-oe6MRx9sX8eF0OUwXHu0xgo,4061
+easyrip-4.16.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+easyrip-4.16.0.dist-info/entry_points.txt,sha256=D6GBMMTzZ-apgX76KyZ6jxMmIFqGYwU9neeLLni_qKI,49
+easyrip-4.16.0.dist-info/top_level.txt,sha256=kuEteBXm-Gf90jRQgH3-fTo-Z-Q6czSuUEqY158H4Ww,8
+easyrip-4.16.0.dist-info/RECORD,,