parsehub 2.0.19__tar.gz → 2.0.20__tar.gz

{parsehub-2.0.19/src/parsehub.egg-info → parsehub-2.0.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: parsehub
-Version: 2.0.19
+Version: 2.0.20
 Summary: 轻量、异步、开箱即用的社交媒体聚合解析库
 Author-email: 梓澪 <zilingmio@gmail.com>
 License: MIT
@@ -37,7 +37,6 @@ Requires-Dist: cryptography>=46.0.6
 Requires-Dist: gmssl>=3.2.2
 Provides-Extra: cli
 Requires-Dist: argcomplete>=3.6.3; extra == "cli"
-Requires-Dist: keyring>=25.6.0; extra == "cli"
 Requires-Dist: platformdirs>=4.5.1; extra == "cli"
 Dynamic: license-file
 

{parsehub-2.0.19 → parsehub-2.0.20}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "parsehub"
-version = "2.0.19"
+version = "2.0.20"
 description = "轻量、异步、开箱即用的社交媒体聚合解析库"
 readme = "README.md"
 requires-python = ">=3.12.0"
@@ -47,7 +47,6 @@ ph = "parsehub.cli:main"
 [project.optional-dependencies]
 cli = [
     "argcomplete>=3.6.3",
-    "keyring>=25.6.0",
     "platformdirs>=4.5.1",
 ]
 

{parsehub-2.0.19 → parsehub-2.0.20}/src/parsehub/cli.py

@@ -1,18 +1,19 @@
 from __future__ import annotations
 
 import argparse
+import importlib.util
 import json
 import sys
 import unicodedata
 from dataclasses import asdict, is_dataclass
 from pathlib import Path
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
-from . import ParseHub
-from .cli_config import AutoCookieStore, ConfigStore, CookiePrompt, PlatformConfig
-from .errors import ParseHubError
+if TYPE_CHECKING:
+    from .cli_config import AutoCookieStore, PlatformConfig
 
 _COMMANDS = {"parse", "p", "download", "d", "dl", "platforms", "ls", "set"}
+_CLI_EXTRA_MODULES = ("argcomplete", "platformdirs")
 
 
 class _ChineseHelpFormatter(argparse.RawDescriptionHelpFormatter):
@@ -48,15 +49,21 @@ class _ChineseArgumentParser(argparse.ArgumentParser):
 
 def main(argv: list[str] | None = None) -> int:
     raw_argv = list(sys.argv[1:] if argv is None else argv)
+    if not _has_cli_extra_dependencies():
+        _print_cli_extra_hint()
+        return 1
     parser = _build_parser(Path(sys.argv[0]).name if argv is None else "parsehub")
     _enable_completion(parser)
+    if not raw_argv:
+        parser.print_help()
+        return 0
     try:
         args = parser.parse_args(_normalize_argv(raw_argv))
         _finalize_output_args(args)
         return args.func(args)
     except SystemExit as e:
         return _normalize_exit_code(e.code)
-    except (ParseHubError, ValueError) as e:
+    except ValueError as e:
         _print_error(e)
         return 1
     except KeyboardInterrupt:
@@ -221,7 +228,7 @@ def _add_json_options(parser: argparse.ArgumentParser) -> None:
 
 
 def _cmd_parse(args: argparse.Namespace) -> int:
-    hub = ParseHub()
+    hub = _new_parsehub()
     platform_id = _detect_platform_id(hub, args.url_or_text)
     config = _load_platform_config(platform_id)
     proxy = args.proxy if args.proxy is not None else config.parse_proxy
@@ -235,7 +242,7 @@ def _cmd_parse(args: argparse.Namespace) -> int:
 
 
 def _cmd_download(args: argparse.Namespace) -> int:
-    hub = ParseHub()
+    hub = _new_parsehub()
     platform_id = _detect_platform_id(hub, args.url_or_text)
     config = _load_platform_config(platform_id)
     proxy = args.proxy if args.proxy is not None else config.download_proxy
@@ -265,7 +272,7 @@ def _cmd_download(args: argparse.Namespace) -> int:
 
 
 def _cmd_platforms(args: argparse.Namespace) -> int:
-    platforms = ParseHub().get_platforms()
+    platforms = _new_parsehub().get_platforms()
     if args.json:
         _print_json(platforms, pretty=args.pretty)
     else:
@@ -284,7 +291,7 @@ def _cmd_platform_list(args: argparse.Namespace) -> int:
 
 def _cmd_platform_show(args: argparse.Namespace) -> int:
     platform = _validate_platform(args.platform)
-    config = ConfigStore().get_platform(platform)
+    config = _config_store().get_platform(platform)
     data = _platform_config_row(_platform_info_map().get(platform, {"id": platform, "name": platform}), config)
     if args.json:
         _print_json(data, pretty=args.pretty)
@@ -298,7 +305,7 @@ def _cmd_platform_proxy(args: argparse.Namespace) -> int:
     if args.clear:
         if args.proxy:
             raise ValueError("清除代理时不需要填写代理地址。\n示例: parsehub set proxy xhs --clear")
-        changed = ConfigStore().clear_proxy(platform, args.proxy_target)
+        changed = _config_store().clear_proxy(platform, args.proxy_target)
         if changed:
             print(f"已清除 {platform} 的{_proxy_target_label(args.proxy_target)}。")
         else:
@@ -306,7 +313,7 @@ def _cmd_platform_proxy(args: argparse.Namespace) -> int:
         return 0
     if not args.proxy:
         raise ValueError("缺少代理地址。\n示例: parsehub set proxy xhs http://127.0.0.1:7890")
-    ConfigStore().set_proxy(platform, args.proxy, args.proxy_target)
+    _config_store().set_proxy(platform, args.proxy, args.proxy_target)
     print(f"已设置 {platform} 的{_proxy_target_label(args.proxy_target)}。")
     print(f"代理地址: {args.proxy}")
     return 0
@@ -314,14 +321,11 @@ def _cmd_platform_proxy(args: argparse.Namespace) -> int:
 
 def _cmd_platform_cookie(args: argparse.Namespace) -> int:
     platform = _validate_platform(args.platform)
-    store = AutoCookieStore()
+    store = _cookie_store()
     if args.clear:
         print(f"已清除 {platform} Cookie。" if store.delete(platform) else f"{platform} 还没有保存 Cookie，无需清除。")
         return 0
-    storage = store.set(platform, CookiePrompt().read(platform))
-    if storage == "file":
-        print("提示: 系统密钥库不可用，Cookie 已保存到本地 cookies.toml。", file=sys.stderr)
-        print("      请不要把该文件提交到 git。", file=sys.stderr)
+    store.set(platform, _cookie_prompt().read(platform))
     print(f"已保存 {platform} Cookie。之后解析或下载该平台内容时会自动使用。")
     return 0
 
@@ -333,16 +337,46 @@ def _print_error(error: Exception) -> None:
         print(f"  {line}", file=sys.stderr)
 
 
+def _new_parsehub() -> Any:
+    from . import ParseHub
+
+    return ParseHub()
+
+
+def _platform_config_type() -> type:
+    from .cli_config import PlatformConfig
+
+    return PlatformConfig
+
+
+def _config_store() -> Any:
+    from .cli_config import ConfigStore
+
+    return ConfigStore()
+
+
+def _cookie_store() -> Any:
+    from .cli_config import AutoCookieStore
+
+    return AutoCookieStore()
+
+
+def _cookie_prompt() -> Any:
+    from .cli_config import CookiePrompt
+
+    return CookiePrompt()
+
+
 def _load_platform_config(platform_id: str | None) -> PlatformConfig:
     if not platform_id:
-        return PlatformConfig()
-    return ConfigStore().get_platform(platform_id)
+        return _platform_config_type()()
+    return _config_store().get_platform(platform_id)
 
 
 def _load_cookie(platform_id: str | None) -> str | None:
     if not platform_id:
         return None
-    return AutoCookieStore().get(platform_id)
+    return _cookie_store().get(platform_id)
 
 
 def _detect_platform_id(hub: Any, url_or_text: str) -> str | None:
@@ -372,19 +406,19 @@ def _validate_platform(platform: str) -> str:
 
 
 def _supported_platform_ids() -> list[str]:
-    return [str(platform.get("id")) for platform in ParseHub().get_platforms() if platform.get("id")]
+    return [str(platform.get("id")) for platform in _new_parsehub().get_platforms() if platform.get("id")]
 
 
 def _platform_info_map() -> dict[str, dict[str, Any]]:
-    return {str(platform.get("id")): platform for platform in ParseHub().get_platforms() if platform.get("id")}
+    return {str(platform.get("id")): platform for platform in _new_parsehub().get_platforms() if platform.get("id")}
 
 
 def _platform_config_rows() -> list[dict[str, Any]]:
-    config_store = ConfigStore()
-    cookie_store = AutoCookieStore()
+    config_store = _config_store()
+    cookie_store = _cookie_store()
     return [
         _platform_config_row(platform, config_store.get_platform(str(platform["id"])), cookie_store=cookie_store)
-        for platform in ParseHub().get_platforms()
+        for platform in _new_parsehub().get_platforms()
     ]
 
 
@@ -396,7 +430,7 @@ def _platform_config_row(
 ) -> dict[str, Any]:
     platform_id = str(platform.get("id") or "")
     if cookie_store is None:
-        cookie_store = AutoCookieStore()
+        cookie_store = _cookie_store()
     return {
         "id": platform_id,
         "name": str(platform.get("name") or ""),
@@ -595,11 +629,19 @@ def _complete_platforms(prefix: str, **_: Any) -> list[str]:
     return [platform for platform in _supported_platform_ids() if platform.startswith(prefix)]
 
 
+def _has_cli_extra_dependencies() -> bool:
+    return all(importlib.util.find_spec(module) is not None for module in _CLI_EXTRA_MODULES)
+
+
+def _print_cli_extra_hint() -> None:
+    print("错误: 未安装 ParseHub CLI 扩展依赖。", file=sys.stderr)
+    print('请运行: pip install "parsehub[cli]"', file=sys.stderr)
+    print('如果使用 uv: uv add "parsehub[cli]"', file=sys.stderr)
+
+
 def _enable_completion(parser: argparse.ArgumentParser) -> None:
-    try:
-        import argcomplete
-    except Exception:
-        return
+    import argcomplete
+
     argcomplete.autocomplete(parser)
 
 

{parsehub-2.0.19 → parsehub-2.0.20}/src/parsehub/cli_config.py

@@ -79,47 +79,6 @@ class ConfigStore:
         return changed
 
 
-class KeyringUnavailable(RuntimeError):
-    pass
-
-
-class KeyringCookieStore:
-    def __init__(self, service: str = "parsehub"):
-        self.service = service
-
-    def set(self, platform: str, cookie: str) -> None:
-        keyring = self._keyring()
-        try:
-            keyring.set_password(self.service, self._username(platform), cookie)
-        except Exception as e:
-            raise KeyringUnavailable(str(e)) from e
-
-    def get(self, platform: str) -> str | None:
-        keyring = self._keyring()
-        try:
-            return keyring.get_password(self.service, self._username(platform))
-        except Exception as e:
-            raise KeyringUnavailable(str(e)) from e
-
-    def delete(self, platform: str) -> bool:
-        try:
-            keyring = self._keyring()
-            keyring.delete_password(self.service, self._username(platform))
-            return True
-        except Exception:
-            return False
-
-    def _keyring(self) -> Any:
-        try:
-            import keyring
-        except Exception as e:
-            raise KeyringUnavailable("keyring 未安装") from e
-        return keyring
-
-    def _username(self, platform: str) -> str:
-        return f"cookie:{platform}"
-
-
 class FileCookieStore:
     def __init__(self, path: Path | None = None):
         self.path = default_cookie_path() if path is None else Path(path)
@@ -163,36 +122,20 @@ class FileCookieStore:
 
 
 class AutoCookieStore:
-    def __init__(
-        self,
-        keyring_store: KeyringCookieStore | None = None,
-        file_store: FileCookieStore | None = None,
-    ):
-        self.keyring_store = KeyringCookieStore() if keyring_store is None else keyring_store
+    def __init__(self, file_store: FileCookieStore | None = None):
         self.file_store = FileCookieStore() if file_store is None else file_store
 
-    def set(self, platform: str, cookie: str) -> Literal["keyring", "file"]:
-        try:
-            self.keyring_store.set(platform, cookie)
-            self.file_store.delete(platform)
-            return "keyring"
-        except KeyringUnavailable:
-            self.file_store.set(platform, cookie)
-            return "file"
+    def set(self, platform: str, cookie: str) -> None:
+        self.file_store.set(platform, cookie)
 
     def get(self, platform: str) -> str | None:
-        try:
-            value = self.keyring_store.get(platform)
-        except KeyringUnavailable:
-            value = None
-        return value or self.file_store.get(platform)
+        return self.file_store.get(platform)
 
     def delete(self, platform: str) -> bool:
-        deleted = self.keyring_store.delete(platform)
-        return self.file_store.delete(platform) or deleted
+        return self.file_store.delete(platform)
 
     def exists(self, platform: str) -> bool:
-        return self.get(platform) is not None
+        return self.file_store.exists(platform)
 
 
 class CookiePrompt:

{parsehub-2.0.19 → parsehub-2.0.20/src/parsehub.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: parsehub
-Version: 2.0.19
+Version: 2.0.20
 Summary: 轻量、异步、开箱即用的社交媒体聚合解析库
 Author-email: 梓澪 <zilingmio@gmail.com>
 License: MIT
@@ -37,7 +37,6 @@ Requires-Dist: cryptography>=46.0.6
 Requires-Dist: gmssl>=3.2.2
 Provides-Extra: cli
 Requires-Dist: argcomplete>=3.6.3; extra == "cli"
-Requires-Dist: keyring>=25.6.0; extra == "cli"
 Requires-Dist: platformdirs>=4.5.1; extra == "cli"
 Dynamic: license-file
 

{parsehub-2.0.19 → parsehub-2.0.20}/src/parsehub.egg-info/requires.txt

@@ -21,5 +21,4 @@ gmssl>=3.2.2
 
 [cli]
 argcomplete>=3.6.3
-keyring>=25.6.0
 platformdirs>=4.5.1

{parsehub-2.0.19 → parsehub-2.0.20}/test/test_cli.py

@@ -5,7 +5,7 @@ import tempfile
 import unittest
 from dataclasses import dataclass
 from pathlib import Path
-from unittest.mock import patch
+from unittest.mock import Mock, patch
 
 from src.parsehub import cli
 from src.parsehub.cli_config import ConfigStore, FileCookieStore
@@ -118,8 +118,8 @@ class TestCli(unittest.TestCase):
         self.config_path = self.config_dir / "config.toml"
         self.cookie_path = self.config_dir / "cookies.toml"
         self.patches = [
-            patch.object(cli, "ConfigStore", lambda: ConfigStore(self.config_path)),
-            patch.object(cli, "AutoCookieStore", lambda: FileCookieStore(self.cookie_path)),
+            patch.object(cli, "_config_store", lambda: ConfigStore(self.config_path)),
+            patch.object(cli, "_cookie_store", lambda: FileCookieStore(self.cookie_path)),
         ]
         for item in self.patches:
             item.start()
@@ -128,12 +128,42 @@ class TestCli(unittest.TestCase):
     def run_cli(self, argv):
         stdout = io.StringIO()
         stderr = io.StringIO()
-        with contextlib.redirect_stdout(stdout), contextlib.redirect_stderr(stderr):
+        with (
+            patch.object(cli, "_has_cli_extra_dependencies", return_value=True),
+            patch.object(cli, "_enable_completion", return_value=None),
+            contextlib.redirect_stdout(stdout),
+            contextlib.redirect_stderr(stderr),
+        ):
             code = cli.main(argv)
         return code, stdout.getvalue(), stderr.getvalue()
 
+    def test_missing_cli_extra_prints_install_hint(self):
+        stdout = io.StringIO()
+        stderr = io.StringIO()
+        with (
+            patch.object(cli, "_has_cli_extra_dependencies", return_value=False),
+            patch.object(cli, "_build_parser") as build_parser,
+            contextlib.redirect_stdout(stdout),
+            contextlib.redirect_stderr(stderr),
+        ):
+            code = cli.main(["platforms"])
+
+        self.assertEqual(code, 1)
+        self.assertEqual(stdout.getvalue(), "")
+        self.assertIn("未安装 ParseHub CLI 扩展依赖", stderr.getvalue())
+        self.assertIn('pip install "parsehub[cli]"', stderr.getvalue())
+        build_parser.assert_not_called()
+
+    def test_empty_args_print_help(self):
+        code, stdout, stderr = self.run_cli([])
+
+        self.assertEqual(code, 0)
+        self.assertEqual(stderr, "")
+        self.assertIn("ParseHub 命令行工具", stdout)
+        self.assertIn("用法:", stdout)
+
     def test_parse_defaults_to_human_readable_chinese_summary(self):
-        with patch.object(cli, "ParseHub", FakeParseHub):
+        with patch.object(cli, "_new_parsehub", FakeParseHub):
             code, stdout, stderr = self.run_cli(
                 ["parse", "分享 https://example.com/post/1", "--proxy", "http://proxy", "--cookie", "a=b"]
             )
@@ -148,7 +178,7 @@ class TestCli(unittest.TestCase):
         )
 
     def test_parse_json_outputs_json(self):
-        with patch.object(cli, "ParseHub", FakeParseHub):
+        with patch.object(cli, "_new_parsehub", FakeParseHub):
             code, stdout, stderr = self.run_cli(["parse", "https://example.com/post/1", "--json"])
 
         self.assertEqual(code, 0)
@@ -156,7 +186,7 @@ class TestCli(unittest.TestCase):
         self.assertEqual(json.loads(stdout)["title"], "标题")
 
     def test_parse_compact_outputs_single_line_json(self):
-        with patch.object(cli, "ParseHub", FakeParseHub):
+        with patch.object(cli, "_new_parsehub", FakeParseHub):
             code, stdout, stderr = self.run_cli(["parse", "https://example.com/post/1", "--compact"])
 
         self.assertEqual(code, 0)
@@ -165,7 +195,7 @@ class TestCli(unittest.TestCase):
         self.assertEqual(json.loads(stdout)["platform"], "xhs")
 
     def test_short_parse_alias_and_default_parse(self):
-        with patch.object(cli, "ParseHub", FakeParseHub):
+        with patch.object(cli, "_new_parsehub", FakeParseHub):
             alias_code, alias_stdout, alias_stderr = self.run_cli(["p", "https://example.com/post/1"])
             default_code, default_stdout, default_stderr = self.run_cli(["https://example.com/post/2"])
 
@@ -179,7 +209,7 @@ class TestCli(unittest.TestCase):
         self.assertEqual(FakeParseHub.instances[1].parse_calls[0]["url"], "https://example.com/post/2")
 
     def test_download_outputs_summary_progress_and_forwards_options(self):
-        with patch.object(cli, "ParseHub", FakeParseHub):
+        with patch.object(cli, "_new_parsehub", FakeParseHub):
             code, stdout, stderr = self.run_cli(
                 [
                     "download",
@@ -211,7 +241,7 @@ class TestCli(unittest.TestCase):
         self.assertTrue(call["save_metadata"])
 
     def test_short_download_alias_outputs_json_and_forwards_output_dir(self):
-        with patch.object(cli, "ParseHub", FakeParseHub):
+        with patch.object(cli, "_new_parsehub", FakeParseHub):
             code, stdout, stderr = self.run_cli(["d", "https://example.com/post/1", "--output-dir", "./out", "--json"])
 
         self.assertEqual(code, 0)
@@ -222,7 +252,7 @@ class TestCli(unittest.TestCase):
         self.assertEqual(FakeParseHub.instances[0].download_calls[0]["path"], "./out")
 
     def test_download_quiet_suppresses_feedback_and_progress_callback(self):
-        with patch.object(cli, "ParseHub", FakeParseHub):
+        with patch.object(cli, "_new_parsehub", FakeParseHub):
             code, stdout, stderr = self.run_cli(["dl", "https://example.com/post/1", "--quiet"])
 
         self.assertEqual(code, 0)
@@ -231,7 +261,7 @@ class TestCli(unittest.TestCase):
         self.assertIsNone(FakeParseHub.instances[0].download_calls[0]["callback"])
 
     def test_download_no_progress_keeps_status_but_disables_callback(self):
-        with patch.object(cli, "ParseHub", FakeParseHub):
+        with patch.object(cli, "_new_parsehub", FakeParseHub):
             code, stdout, stderr = self.run_cli(["download", "https://example.com/post/1", "--no-progress"])
 
         self.assertEqual(code, 0)
@@ -241,7 +271,7 @@ class TestCli(unittest.TestCase):
         self.assertIsNone(FakeParseHub.instances[0].download_calls[0]["callback"])
 
     def test_download_defaults_path_to_cwd_downloads(self):
-        with patch.object(cli, "ParseHub", FakeParseHub):
+        with patch.object(cli, "_new_parsehub", FakeParseHub):
             code, stdout, stderr = self.run_cli(["download", "https://example.com/post/1", "--quiet"])
 
         self.assertEqual(code, 0)
@@ -249,7 +279,7 @@ class TestCli(unittest.TestCase):
         self.assertEqual(FakeParseHub.instances[0].download_calls[0]["path"], Path.cwd() / "downloads")
 
     def test_platforms_outputs_aligned_human_readable_table(self):
-        with patch.object(cli, "ParseHub", FakeParseHub):
+        with patch.object(cli, "_new_parsehub", FakeParseHub):
             code, stdout, stderr = self.run_cli(["platforms"])
 
         self.assertEqual(code, 0)
@@ -261,7 +291,7 @@ class TestCli(unittest.TestCase):
         self.assertEqual(lines[3], "weibo  微博    视频")
 
     def test_short_platforms_alias_outputs_json(self):
-        with patch.object(cli, "ParseHub", FakeParseHub):
+        with patch.object(cli, "_new_parsehub", FakeParseHub):
             code, stdout, stderr = self.run_cli(["ls", "--json"])
 
         self.assertEqual(code, 0)
@@ -275,7 +305,7 @@ class TestCli(unittest.TestCase):
         )
 
     def test_set_proxy_sets_and_shows_parse_and_download_proxy(self):
-        with patch.object(cli, "ParseHub", FakeParseHub):
+        with patch.object(cli, "_new_parsehub", FakeParseHub):
             set_code, set_stdout, set_stderr = self.run_cli(["set", "proxy", "xhs", "http://proxy"])
             show_code, show_stdout, show_stderr = self.run_cli(["set", "show", "xhs"])
 
@@ -291,7 +321,7 @@ class TestCli(unittest.TestCase):
         self.assertIn('download_proxy = "http://proxy"', self.config_path.read_text())
 
     def test_set_proxy_supports_targeted_clear(self):
-        with patch.object(cli, "ParseHub", FakeParseHub):
+        with patch.object(cli, "_new_parsehub", FakeParseHub):
             self.run_cli(["set", "proxy", "xhs", "http://parse", "--for", "parse"])
             self.run_cli(["set", "proxy", "xhs", "http://download", "--for", "download"])
             code, stdout, stderr = self.run_cli(["set", "proxy", "xhs", "--clear", "--for", "parse"])
@@ -306,9 +336,11 @@ class TestCli(unittest.TestCase):
         self.assertIn("下载代理: http://download", show_stdout)
 
     def test_set_cookie_sets_lists_and_clears_cookie_without_printing_value(self):
+        prompt = Mock()
+        prompt.read.return_value = "a=b; token=secret"
         with (
-            patch.object(cli, "ParseHub", FakeParseHub),
-            patch.object(cli.CookiePrompt, "read", return_value="a=b; token=secret"),
+            patch.object(cli, "_new_parsehub", FakeParseHub),
+            patch.object(cli, "_cookie_prompt", return_value=prompt),
         ):
             set_code, set_stdout, set_stderr = self.run_cli(["set", "cookie", "xhs"])
             list_code, list_stdout, list_stderr = self.run_cli(["set", "list"])
@@ -330,7 +362,7 @@ class TestCli(unittest.TestCase):
     def test_parse_uses_saved_platform_proxy_and_cookie(self):
         ConfigStore(self.config_path).set_proxy("xhs", "http://parse-proxy", "parse")
         FileCookieStore(self.cookie_path).set("xhs", "saved=cookie")
-        with patch.object(cli, "ParseHub", FakeParseHub):
+        with patch.object(cli, "_new_parsehub", FakeParseHub):
             code, stdout, stderr = self.run_cli(["parse", "https://example.com/post/1"])
 
         self.assertEqual(code, 0)
@@ -344,7 +376,7 @@ class TestCli(unittest.TestCase):
         store.set_proxy("xhs", "http://parse-proxy", "parse")
         store.set_proxy("xhs", "http://download-proxy", "download")
         FileCookieStore(self.cookie_path).set("xhs", "saved=cookie")
-        with patch.object(cli, "ParseHub", FakeParseHub):
+        with patch.object(cli, "_new_parsehub", FakeParseHub):
             code, stdout, stderr = self.run_cli(["download", "https://example.com/post/1", "--quiet"])
 
         self.assertEqual(code, 0)
@@ -358,7 +390,7 @@ class TestCli(unittest.TestCase):
     def test_cli_options_override_saved_platform_config(self):
         ConfigStore(self.config_path).set_proxy("xhs", "http://saved-proxy", "all")
         FileCookieStore(self.cookie_path).set("xhs", "saved=cookie")
-        with patch.object(cli, "ParseHub", FakeParseHub):
+        with patch.object(cli, "_new_parsehub", FakeParseHub):
             code, stdout, stderr = self.run_cli(
                 [
                     "download",
@@ -382,7 +414,7 @@ class TestCli(unittest.TestCase):
         self.assertEqual(call["parse_cookie"], "cli=cookie")
 
     def test_parsehub_error_returns_one(self):
-        with patch.object(cli, "ParseHub", ErrorParseHub):
+        with patch.object(cli, "_new_parsehub", ErrorParseHub):
             code, stdout, stderr = self.run_cli(["parse", "https://example.com/post/1"])
 
         self.assertEqual(code, 1)
@@ -391,7 +423,7 @@ class TestCli(unittest.TestCase):
         self.assertIn("错误", stderr)
 
     def test_value_error_returns_one(self):
-        with patch.object(cli, "ParseHub", ValueErrorParseHub):
+        with patch.object(cli, "_new_parsehub", ValueErrorParseHub):
             code, stdout, stderr = self.run_cli(["parse", "https://example.com/post/1"])
 
         self.assertEqual(code, 1)
@@ -400,7 +432,7 @@ class TestCli(unittest.TestCase):
         self.assertIn("错误", stderr)
 
     def test_keyboard_interrupt_returns_130(self):
-        with patch.object(cli, "ParseHub", KeyboardInterruptParseHub):
+        with patch.object(cli, "_new_parsehub", KeyboardInterruptParseHub):
             code, stdout, stderr = self.run_cli(["parse", "https://example.com/post/1"])
 
         self.assertEqual(code, 130)
@@ -426,7 +458,7 @@ class TestCli(unittest.TestCase):
         self.assertIn("parsehub set proxy xhs", stdout)
 
     def test_set_proxy_missing_value_shows_actionable_example(self):
-        with patch.object(cli, "ParseHub", FakeParseHub):
+        with patch.object(cli, "_new_parsehub", FakeParseHub):
             code, stdout, stderr = self.run_cli(["set", "proxy", "xhs"])
 
         self.assertEqual(code, 1)
@@ -436,7 +468,7 @@ class TestCli(unittest.TestCase):
         self.assertIn("\n  示例:", stderr)
 
     def test_unknown_platform_error_lists_next_step(self):
-        with patch.object(cli, "ParseHub", FakeParseHub):
+        with patch.object(cli, "_new_parsehub", FakeParseHub):
             code, stdout, stderr = self.run_cli(["set", "show", "unknown"])
 
         self.assertEqual(code, 1)

parsehub-2.0.20/test/test_cli_config.py

@@ -0,0 +1,49 @@
+import tempfile
+import unittest
+from pathlib import Path
+
+from src.parsehub.cli_config import AutoCookieStore, ConfigStore, FileCookieStore
+
+
+class TestCliConfig(unittest.TestCase):
+    def setUp(self):
+        self.tmp = tempfile.TemporaryDirectory()
+        self.addCleanup(self.tmp.cleanup)
+        self.base = Path(self.tmp.name)
+
+    def test_config_store_sets_and_clears_targeted_proxy(self):
+        store = ConfigStore(self.base / "config.toml")
+
+        store.set_proxy("xhs", "http://parse", "parse")
+        store.set_proxy("xhs", "http://download", "download")
+
+        config = store.get_platform("xhs")
+        self.assertEqual(config.parse_proxy, "http://parse")
+        self.assertEqual(config.download_proxy, "http://download")
+
+        self.assertTrue(store.clear_proxy("xhs", "parse"))
+        config = store.get_platform("xhs")
+        self.assertIsNone(config.parse_proxy)
+        self.assertEqual(config.download_proxy, "http://download")
+
+    def test_auto_cookie_store_uses_private_file(self):
+        path = self.base / "cookies.toml"
+        store = AutoCookieStore(file_store=FileCookieStore(path))
+
+        store.set("xhs", "a=b")
+
+        self.assertEqual(store.get("xhs"), "a=b")
+        self.assertEqual(path.stat().st_mode & 0o777, 0o600)
+
+    def test_auto_cookie_store_deletes_private_file_cookie(self):
+        path = self.base / "cookies.toml"
+        store = AutoCookieStore(file_store=FileCookieStore(path))
+        store.set("xhs", "a=b")
+
+        self.assertTrue(store.delete("xhs"))
+
+        self.assertFalse(store.exists("xhs"))
+
+
+if __name__ == "__main__":
+    unittest.main()

parsehub-2.0.19/test/test_cli_config.py

@@ -1,79 +0,0 @@
-import tempfile
-import unittest
-from pathlib import Path
-
-from src.parsehub.cli_config import AutoCookieStore, ConfigStore, FileCookieStore, KeyringUnavailable
-
-
-class UnavailableKeyringStore:
-    def set(self, platform, cookie):
-        raise KeyringUnavailable("unavailable")
-
-    def get(self, platform):
-        raise KeyringUnavailable("unavailable")
-
-    def delete(self, platform):
-        return False
-
-
-class MemoryKeyringStore:
-    def __init__(self):
-        self.values = {}
-
-    def set(self, platform, cookie):
-        self.values[platform] = cookie
-
-    def get(self, platform):
-        return self.values.get(platform)
-
-    def delete(self, platform):
-        return self.values.pop(platform, None) is not None
-
-
-class TestCliConfig(unittest.TestCase):
-    def setUp(self):
-        self.tmp = tempfile.TemporaryDirectory()
-        self.addCleanup(self.tmp.cleanup)
-        self.base = Path(self.tmp.name)
-
-    def test_config_store_sets_and_clears_targeted_proxy(self):
-        store = ConfigStore(self.base / "config.toml")
-
-        store.set_proxy("xhs", "http://parse", "parse")
-        store.set_proxy("xhs", "http://download", "download")
-
-        config = store.get_platform("xhs")
-        self.assertEqual(config.parse_proxy, "http://parse")
-        self.assertEqual(config.download_proxy, "http://download")
-
-        self.assertTrue(store.clear_proxy("xhs", "parse"))
-        config = store.get_platform("xhs")
-        self.assertIsNone(config.parse_proxy)
-        self.assertEqual(config.download_proxy, "http://download")
-
-    def test_auto_cookie_store_falls_back_to_private_file(self):
-        path = self.base / "cookies.toml"
-        store = AutoCookieStore(keyring_store=UnavailableKeyringStore(), file_store=FileCookieStore(path))
-
-        storage = store.set("xhs", "a=b")
-
-        self.assertEqual(storage, "file")
-        self.assertEqual(store.get("xhs"), "a=b")
-        self.assertEqual(path.stat().st_mode & 0o777, 0o600)
-
-    def test_auto_cookie_store_prefers_keyring_and_removes_file_fallback(self):
-        path = self.base / "cookies.toml"
-        file_store = FileCookieStore(path)
-        file_store.set("xhs", "old=file")
-        keyring_store = MemoryKeyringStore()
-        store = AutoCookieStore(keyring_store=keyring_store, file_store=file_store)
-
-        storage = store.set("xhs", "new=keyring")
-
-        self.assertEqual(storage, "keyring")
-        self.assertEqual(store.get("xhs"), "new=keyring")
-        self.assertFalse(file_store.exists("xhs"))
-
-
-if __name__ == "__main__":
-    unittest.main()