easyrip 3.13.2__py3-none-any.whl → 4.9.1__py3-none-any.whl

easyrip/easyrip_prompt.py

@@ -0,0 +1,73 @@
+import os
+from collections.abc import Iterable
+
+from prompt_toolkit.completion import CompleteEvent, Completer, Completion
+from prompt_toolkit.document import Document
+from prompt_toolkit.history import FileHistory
+
+from .global_val import C_Z, CONFIG_DIR
+
+
+class easyrip_prompt:
+    PROMPT_HISTORY_FILE = CONFIG_DIR / "prompt_history.txt"
+
+    @classmethod
+    def clear(cls) -> None:
+        cls.PROMPT_HISTORY_FILE.unlink(True)
+
+
+class ConfigFileHistory(FileHistory):
+    def store_string(self, string: str) -> None:
+        if not string.startswith(C_Z):
+            super().store_string(string)
+
+
+class SmartPathCompleter(Completer):
+    def __init__(self) -> None:
+        pass
+
+    def get_completions(
+        self,
+        document: Document,
+        complete_event: CompleteEvent,  # noqa: ARG002
+    ) -> Iterable[Completion]:
+        text = document.text_before_cursor.strip("\"'")
+
+        try:
+            directory = (
+                os.path.dirname(os.path.join(".", text))
+                if os.path.dirname(text)
+                else "."
+            )
+
+            prefix = os.path.basename(text)
+
+            filenames: list[tuple[str, str]] = (
+                [
+                    (directory, filename)
+                    for filename in os.listdir(directory)
+                    if filename.startswith(prefix)
+                ]
+                if os.path.isdir(directory)
+                else []
+            )
+
+            for directory, filename in sorted(filenames, key=lambda k: k[1]):
+                completion = filename[len(prefix) :]
+                full_name = os.path.join(directory, filename)
+
+                if os.path.isdir(full_name):
+                    filename += "/"
+
+                yield Completion(
+                    text=(
+                        f'{"" if any(c in text for c in "\\/") else '"'}{completion}"'
+                        if any(c in r"""!$%&()*:;<=>?[]^`{|}~""" for c in completion)
+                        else completion
+                    ),
+                    start_position=0,
+                    display=filename,
+                )
+
+        except OSError:
+            pass

easyrip/easyrip_web/__init__.py

@@ -1,8 +1,9 @@
 from .http_server import run_server
-from .third_party_api import github, zhconvert
+from .third_party_api import github, mkvtoolnix, zhconvert
 
 __all__ = [
     "github",
+    "mkvtoolnix",
     "run_server",
     "zhconvert",
 ]

easyrip/easyrip_web/http_server.py

@@ -4,44 +4,32 @@ import os
 import secrets
 import signal
 from collections import deque
+from collections.abc import Callable
 from http.server import BaseHTTPRequestHandler, HTTPServer
 from threading import Thread
 from time import sleep
 
-from Crypto.Cipher import AES as CryptoAES
-from Crypto.Util.Padding import pad, unpad
+from ..utils import AES
 
-__all__ = ["Event", "run_server"]
-
-
-class AES:
-    @staticmethod
-    def encrypt(plaintext: bytes, key: bytes) -> bytes:
-        cipher = CryptoAES.new(key, CryptoAES.MODE_CBC)  # 使用 CBC 模式
-        ciphertext = cipher.encrypt(pad(plaintext, CryptoAES.block_size))  # 加密并填充
-        return bytes(cipher.iv) + ciphertext  # 返回 IV 和密文
-
-    @staticmethod
-    def decrypt(ciphertext: bytes, key: bytes) -> bytes:
-        iv = ciphertext[:16]  # 提取 IV
-        cipher = CryptoAES.new(key, CryptoAES.MODE_CBC, iv=iv)
-        plaintext = unpad(
-            cipher.decrypt(ciphertext[16:]), CryptoAES.block_size
-        )  # 解密并去除填充
-        return plaintext
+__all__ = ["run_server"]
 
 
 class Event:
     log_queue: deque[tuple[str, str, str]] = deque()
+
     is_run_command: bool = False
-    """
-    用于防止 server 二次运行，以及告知客户端运行状态
-    """
+    """用于防止 server 二次运行，以及告知客户端运行状态"""
+
     progress: deque[dict[str, int | float]] = deque([{}])
 
-    @staticmethod
-    def post_run_event(cmd: str):
-        pass
+    @classmethod
+    def post_run_event(cls, cmd: str) -> None:
+        from ..easyrip_main import run_command
+
+        try:
+            run_command(cmd)
+        finally:
+            cls.is_run_command = False
 
 
 class MainHTTPRequestHandler(BaseHTTPRequestHandler):
@@ -68,14 +56,19 @@ class MainHTTPRequestHandler(BaseHTTPRequestHandler):
             .strip('"')
         )
 
-    def do_OPTIONS(self):
-        self.send_response(200)
+    def _send_cors_headers(self) -> None:
+        """统一设置 CORS 头"""
         self.send_header("Access-Control-Allow-Origin", "*")
-        self.send_header("Access-Control-Allow-Methods", "POST, GET, OPTIONS")
+        self.send_header("Access-Control-Allow-Methods", "GET, POST, OPTIONS")
         self.send_header("Access-Control-Allow-Headers", "Content-Type, Authorization")
+        # self.send_header("Access-Control-Allow-Credentials", "true")
+
+    def do_OPTIONS(self) -> None:
+        self.send_response(200)
+        self._send_cors_headers()
         self.end_headers()
 
-    def do_POST(self):
+    def do_POST(self) -> None:
         from ..easyrip_log import log
 
         # 获取请求体的长度
@@ -111,7 +104,7 @@ class MainHTTPRequestHandler(BaseHTTPRequestHandler):
 
             # 设置标志请求关闭服务
             if data.get("shutdown") == "shutdown":
-                self.server.shutdown_requested = True  # type: ignore
+                self.server.shutdown_requested = True  # pyright: ignore[reportAttributeAccessIssue]
 
             # 通过 token 判断一致性
             if (
@@ -151,11 +144,6 @@ class MainHTTPRequestHandler(BaseHTTPRequestHandler):
                             sleep(1)
                     except KeyboardInterrupt:
                         log.error("Manually force exit")
-                        # Event.is_run_command.append(False)
-                        # Event.is_run_command.popleft()
-                        # sleep(1)
-                        # Event.progress.append({})
-                        # Event.progress.popleft()
 
                 elif Event.is_run_command is True:
                     log.warning("There is a running command, terminate this request")
@@ -187,15 +175,15 @@ class MainHTTPRequestHandler(BaseHTTPRequestHandler):
             header = ("Content-type", "text/html")
 
         self.send_response(status_code)
-        self.send_header("Access-Control-Allow-Origin", "*")
+        self._send_cors_headers()
         self.send_header(*header)
         self.send_header("Content-Length", str(len(response)))
         self.end_headers()
         self.wfile.write(response.encode(encoding="utf-8"))
 
-    def do_GET(self):
+    def do_GET(self) -> None:
         self.send_response(200)
-        self.send_header("Access-Control-Allow-Origin", "*")
+        self._send_cors_headers()
         self.send_header("Content-Type", "application/json")
         self.end_headers()
         self.wfile.write(
@@ -217,7 +205,13 @@ class MainHTTPRequestHandler(BaseHTTPRequestHandler):
         )
 
 
-def run_server(host: str = "", port: int = 0, password: str | None = None):
+def run_server(
+    host: str = "",
+    port: int = 0,
+    password: str | None = None,
+    *,
+    after_start_server_hook: Callable[[], None] = lambda: None,
+) -> None:
     from ..easyrip_log import log
 
     MainHTTPRequestHandler.token = secrets.token_urlsafe(16)
@@ -226,11 +220,31 @@ def run_server(host: str = "", port: int = 0, password: str | None = None):
         _pw_sha3_512 = hashlib.sha3_512(MainHTTPRequestHandler.password.encode())
         MainHTTPRequestHandler.password_sha3_512_last8 = _pw_sha3_512.hexdigest()[-8:]
         MainHTTPRequestHandler.aes_key = _pw_sha3_512.digest()[:16]
+    else:
+        MainHTTPRequestHandler.password = None
+        MainHTTPRequestHandler.password_sha3_512_last8 = None
+        MainHTTPRequestHandler.aes_key = None
 
     server_address = (host, port)
     httpd = HTTPServer(server_address, MainHTTPRequestHandler)
-    log.info("Starting HTTP service on port {}...", httpd.server_port)
+
+    protocol = "HTTP"
+
+    def _hook() -> None:
+        try:
+            after_start_server_hook()
+        finally:
+            Event.is_run_command = False
+
+    Event.is_run_command = True
+    Thread(target=_hook, daemon=True).start()
+
+    log.info(
+        "Starting {protocol} service on port {port}...",
+        protocol=protocol,
+        port=httpd.server_port,
+    )
     try:
         httpd.serve_forever()
     except KeyboardInterrupt:
-        log.info("HTTP service stopped by ^C")
+        log.info("{} service stopped by ^C", protocol)

easyrip/easyrip_web/third_party_api.py

@@ -3,6 +3,7 @@ import json
 import urllib.error
 import urllib.parse
 import urllib.request
+import xml.etree.ElementTree
 from time import sleep
 
 
@@ -27,6 +28,7 @@ class zhconvert:
         org_text: str,
         target_lang: Target_lang,
     ) -> str:
+        """失败抛出异常"""
         from ..easyrip_log import log
 
         log.info(
@@ -60,10 +62,10 @@ class zhconvert:
                         return text
 
                     raise Exception(f"HTTP error: {response.getcode()}")
-            except urllib.error.HTTPError as e:
+            except urllib.error.HTTPError:
                 sleep(0.5)
                 if retry_num == 4:
-                    raise e
+                    raise
                 log.debug("Attempt to reconnect")
                 continue
 
@@ -71,15 +73,65 @@ class zhconvert:
 
 
 class github:
-    @staticmethod
-    def get_release_ver(release_api_url: str) -> str | None:
+    @classmethod
+    def get_latest_release_ver(cls, release_api_url: str) -> str | None:
+        """失败返回 None"""
+        from ..easyrip_log import log
+
         req = urllib.request.Request(release_api_url)
 
         try:
             with urllib.request.urlopen(req) as response:
-                data = json.loads(response.read().decode("utf-8"))
-                return data.get("tag_name")
-        except Exception:
-            pass
+                data: dict = json.loads(response.read().decode("utf-8"))
+                ver = data.get("tag_name")
+                if ver is None:
+                    return None
+                if isinstance(ver, str):
+                    return ver.lstrip("v")
+                raise ValueError(f"ver = {ver!r}")
+        except Exception as e:
+            log.debug(
+                "'{}' execution failed: {}",
+                f"{cls.__name__}.{cls.get_latest_release_ver.__name__}",
+                e,
+                print_level=log.LogLevel._detail,
+            )
+
+        return None
+
+
+class mkvtoolnix:
+    __latest_release_ver_cache: str | None = None
+
+    @classmethod
+    def get_latest_release_ver(cls, *, flush_cache: bool = False) -> str | None:
+        """失败返回 None"""
+        if flush_cache is False and cls.__latest_release_ver_cache is not None:
+            return cls.__latest_release_ver_cache
+
+        from ..easyrip_log import log
+
+        req = urllib.request.Request("https://mkvtoolnix.download/latest-release.xml")
+
+        try:
+            with urllib.request.urlopen(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(
+                        "'{}' execution failed: {}",
+                        f"{cls.__name__}.{cls.get_latest_release_ver.__name__}",
+                        f"XML parse faild: {xml.etree.ElementTree.tostring(xml_tree)}",
+                        print_level=log.LogLevel._detail,
+                    )
+                    return None
+                cls.__latest_release_ver_cache = ver.text
+                return ver.text
+        except Exception as e:
+            log.debug(
+                "'{}' execution failed: {}",
+                f"{cls.__name__}.{cls.get_latest_release_ver.__name__}",
+                e,
+                print_level=log.LogLevel._detail,
+            )
 
         return None

easyrip/global_val.py

@@ -1,5 +1,25 @@
+import os
+import sys
+from pathlib import Path
+
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "3.13.2"
+PROJECT_VERSION = "4.9.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"
+
+
+if sys.platform == "win32":
+    # Windows: C:\Users\<用户名>\AppData\Roaming\<app_name>
+    __config_dir = Path(os.getenv("APPDATA", ""))
+elif sys.platform == "darwin":
+    # macOS: ~/Library/Application Support/<app_name>
+    __config_dir = Path(os.path.expanduser("~")) / "Library" / "Application Support"
+else:
+    # Linux: ~/.config/<app_name>
+    __config_dir = Path(os.path.expanduser("~")) / ".config"
+CONFIG_DIR = Path(__config_dir) / PROJECT_NAME
+
+
+C_D = "\x04"
+C_Z = "\x1a"

easyrip/ripper/media_info.py

@@ -2,12 +2,18 @@ import json
 import subprocess
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Self
+from typing import Self, final
 
 from ..easyrip_log import log
+from ..easyrip_mlang import Mlang_exception
 from ..utils import time_str_to_sec
 
 
+class Stream_error(Mlang_exception):
+    pass
+
+
+@final
 @dataclass(slots=True)
 class Audio_info:
     index: int
@@ -17,6 +23,7 @@ class Audio_info:
     bits_per_raw_sample: int = 0
 
 
+@final
 @dataclass(slots=True)
 class Media_info:
     width: int = 0
@@ -59,7 +66,7 @@ class Media_info:
         )
         _info_list: list = _info.get("streams", [])
 
-        _video_info_dict: dict = _info_list[0] if _info_list else dict()
+        _video_info_dict: dict = _info_list[0] if _info_list else {}
 
         media_info.width = int(_video_info_dict.get("width", "0"))
         media_info.height = int(_video_info_dict.get("height", "0"))
@@ -104,7 +111,7 @@ class Media_info:
 
         for _audio_info_dict in _info_list:
             if not isinstance(_audio_info_dict, dict):
-                _audio_info_dict = dict()
+                _audio_info_dict = {}
 
             index = _audio_info_dict.get("index")
             if index is None: