novel-downloader 1.4.5__py3-none-any.whl → 1.5.0__py3-none-any.whl

novel_downloader/core/fetchers/biquge/browser.py

@@ -8,9 +8,14 @@ novel_downloader.core.fetchers.biquge.browser
 from typing import Any
 
 from novel_downloader.core.fetchers.base import BaseBrowser
+from novel_downloader.core.fetchers.registry import register_fetcher
 from novel_downloader.models import FetcherConfig
 
 
+@register_fetcher(
+    site_keys=["biquge", "bqg"],
+    backends=["browser"],
+)
 class BiqugeBrowser(BaseBrowser):
     """
     A browser class for interacting with the Biquge (www.b520.cc) novel website.

novel_downloader/core/fetchers/biquge/session.py

@@ -8,9 +8,14 @@ novel_downloader.core.fetchers.biquge.session
 from typing import Any
 
 from novel_downloader.core.fetchers.base import BaseSession
+from novel_downloader.core.fetchers.registry import register_fetcher
 from novel_downloader.models import FetcherConfig
 
 
+@register_fetcher(
+    site_keys=["biquge", "bqg"],
+    backends=["session"],
+)
 class BiqugeSession(BaseSession):
     """
     A session class for interacting with the Biquge (www.b520.cc) novel website.
@@ -55,7 +60,7 @@ class BiqugeSession(BaseSession):
         :return: The chapter content as a string.
         """
         url = self.chapter_url(book_id=book_id, chapter_id=chapter_id)
-        return [await self.fetch(url, **kwargs)]
+        return [await self.fetch(url, encoding="gbk", **kwargs)]
 
     @classmethod
     def book_info_url(cls, book_id: str) -> str:

novel_downloader/core/fetchers/esjzone/__init__.py

@@ -5,10 +5,10 @@ novel_downloader.core.fetchers.esjzone
 
 """
 
-from .browser import EsjzoneBrowser
-from .session import EsjzoneSession
-
 __all__ = [
     "EsjzoneBrowser",
     "EsjzoneSession",
 ]
+
+from .browser import EsjzoneBrowser
+from .session import EsjzoneSession

novel_downloader/core/fetchers/esjzone/browser.py

@@ -8,9 +8,14 @@ novel_downloader.core.fetchers.esjzone.browser
 from typing import Any
 
 from novel_downloader.core.fetchers.base import BaseBrowser
+from novel_downloader.core.fetchers.registry import register_fetcher
 from novel_downloader.models import FetcherConfig, LoginField
 
 
+@register_fetcher(
+    site_keys=["esjzone"],
+    backends=["browser"],
+)
 class EsjzoneBrowser(BaseBrowser):
     """
     A browser class for interacting with the Esjzone (www.esjzone.cc) novel website.

novel_downloader/core/fetchers/esjzone/session.py

@@ -9,10 +9,15 @@ import re
 from typing import Any
 
 from novel_downloader.core.fetchers.base import BaseSession
+from novel_downloader.core.fetchers.registry import register_fetcher
 from novel_downloader.models import FetcherConfig, LoginField
-from novel_downloader.utils.time_utils import async_sleep_with_random_delay
+from novel_downloader.utils import async_sleep_with_random_delay
 
 
+@register_fetcher(
+    site_keys=["esjzone"],
+    backends=["session"],
+)
 class EsjzoneSession(BaseSession):
     """
     A session class for interacting with the esjzone (www.esjzone.cc) novel website.

novel_downloader/core/fetchers/linovelib/__init__.py

@@ -5,10 +5,10 @@ novel_downloader.core.fetchers.linovelib
 
 """
 
-from .browser import LinovelibBrowser
-from .session import LinovelibSession
-
 __all__ = [
     "LinovelibBrowser",
     "LinovelibSession",
 ]
+
+from .browser import LinovelibBrowser
+from .session import LinovelibSession

novel_downloader/core/fetchers/linovelib/browser.py

@@ -9,10 +9,15 @@ import re
 from typing import Any
 
 from novel_downloader.core.fetchers.base import BaseBrowser
+from novel_downloader.core.fetchers.registry import register_fetcher
 from novel_downloader.models import FetcherConfig
-from novel_downloader.utils.time_utils import async_sleep_with_random_delay
+from novel_downloader.utils import async_sleep_with_random_delay
 
 
+@register_fetcher(
+    site_keys=["linovelib"],
+    backends=["browser"],
+)
 class LinovelibBrowser(BaseBrowser):
     """
     A browser class for interacting with Linovelib (www.linovelib.com) novel website.

novel_downloader/core/fetchers/linovelib/session.py

@@ -9,10 +9,15 @@ import re
 from typing import Any
 
 from novel_downloader.core.fetchers.base import BaseSession
+from novel_downloader.core.fetchers.registry import register_fetcher
 from novel_downloader.models import FetcherConfig
-from novel_downloader.utils.time_utils import async_sleep_with_random_delay
+from novel_downloader.utils import async_sleep_with_random_delay
 
 
+@register_fetcher(
+    site_keys=["linovelib"],
+    backends=["session"],
+)
 class LinovelibSession(BaseSession):
     """
     A session class for interacting with Linovelib (www.linovelib.com) novel website.

novel_downloader/core/fetchers/qianbi/__init__.py

@@ -5,10 +5,10 @@ novel_downloader.core.fetchers.qianbi
 
 """
 
-from .browser import QianbiBrowser
-from .session import QianbiSession
-
 __all__ = [
     "QianbiBrowser",
     "QianbiSession",
 ]
+
+from .browser import QianbiBrowser
+from .session import QianbiSession

novel_downloader/core/fetchers/qianbi/browser.py

@@ -8,9 +8,14 @@ novel_downloader.core.fetchers.qianbi.browser
 from typing import Any
 
 from novel_downloader.core.fetchers.base import BaseBrowser
+from novel_downloader.core.fetchers.registry import register_fetcher
 from novel_downloader.models import FetcherConfig
 
 
+@register_fetcher(
+    site_keys=["qianbi"],
+    backends=["browser"],
+)
 class QianbiBrowser(BaseBrowser):
     """
     A browser class for interacting with the Qianbi (www.23qb.com) novel website.

novel_downloader/core/fetchers/qianbi/session.py

@@ -9,9 +9,14 @@ import asyncio
 from typing import Any
 
 from novel_downloader.core.fetchers.base import BaseSession
+from novel_downloader.core.fetchers.registry import register_fetcher
 from novel_downloader.models import FetcherConfig
 
 
+@register_fetcher(
+    site_keys=["qianbi"],
+    backends=["session"],
+)
 class QianbiSession(BaseSession):
     """
     A session class for interacting with the Qianbi (www.23qb.com) novel website.

novel_downloader/core/fetchers/qidian/__init__.py

@@ -5,10 +5,10 @@ novel_downloader.core.fetchers.qidian
 
 """
 
-from .browser import QidianBrowser
-from .session import QidianSession
-
 __all__ = [
     "QidianBrowser",
     "QidianSession",
 ]
+
+from .browser import QidianBrowser
+from .session import QidianSession

novel_downloader/core/fetchers/qidian/browser.py

@@ -11,15 +11,21 @@ from typing import Any
 from playwright.async_api import Page
 
 from novel_downloader.core.fetchers.base import BaseBrowser
+from novel_downloader.core.fetchers.registry import register_fetcher
 from novel_downloader.models import FetcherConfig, LoginField
 from novel_downloader.utils.i18n import t
 
 
+@register_fetcher(
+    site_keys=["qidian", "qd"],
+    backends=["browser"],
+)
 class QidianBrowser(BaseBrowser):
     """
     A browser class for interacting with the Qidian (www.qidian.com) novel website.
     """
 
+    WAIT_TIME = 2.0
     HOMEPAGE_URL = "https://www.qidian.com/"
     BOOKCASE_URL = "https://my.qidian.com/bookcase/"
     # BOOK_INFO_URL = "https://book.qidian.com/info/{book_id}/"
@@ -59,7 +65,7 @@ class QidianBrowser(BaseBrowser):
         :return: The page content as a string.
         """
         url = self.book_info_url(book_id=book_id)
-        return [await self.fetch(url, **kwargs)]
+        return [await self.fetch(url, delay=self.WAIT_TIME, **kwargs)]
 
     async def get_book_chapter(
         self,
@@ -76,7 +82,9 @@ class QidianBrowser(BaseBrowser):
         """
         catalog_url = self.book_info_url(book_id=book_id)
         url = self.chapter_url(book_id=book_id, chapter_id=chapter_id)
-        return [await self.fetch(url, referer=catalog_url, **kwargs)]
+        return [
+            await self.fetch(url, referer=catalog_url, delay=self.WAIT_TIME, **kwargs)
+        ]
 
     async def get_bookcase(
         self,
@@ -88,7 +96,7 @@ class QidianBrowser(BaseBrowser):
         :return: The HTML markup of the bookcase page.
         """
         url = self.bookcase_url()
-        return [await self.fetch(url, **kwargs)]
+        return [await self.fetch(url, delay=self.WAIT_TIME, **kwargs)]
 
     async def get_homepage(
         self,
@@ -100,7 +108,7 @@ class QidianBrowser(BaseBrowser):
         :return: The HTML markup of the home page.
         """
         url = self.homepage_url()
-        return [await self.fetch(url, **kwargs)]
+        return [await self.fetch(url, delay=self.WAIT_TIME, **kwargs)]
 
     async def set_interactive_mode(self, enable: bool) -> bool:
         """

novel_downloader/core/fetchers/qidian/session.py

@@ -15,11 +15,18 @@ from typing import Any, ClassVar
 import aiohttp
 
 from novel_downloader.core.fetchers.base import BaseSession
+from novel_downloader.core.fetchers.registry import register_fetcher
 from novel_downloader.models import FetcherConfig, LoginField
-from novel_downloader.utils.crypto_utils import rc4_crypt
-from novel_downloader.utils.time_utils import async_sleep_with_random_delay
+from novel_downloader.utils import (
+    async_sleep_with_random_delay,
+    rc4_crypt,
+)
 
 
+@register_fetcher(
+    site_keys=["qidian", "qd"],
+    backends=["session"],
+)
 class QidianSession(BaseSession):
     """
     A session class for interacting with the Qidian (www.qidian.com) novel website.
@@ -144,6 +151,7 @@ class QidianSession(BaseSession):
     async def fetch(
         self,
         url: str,
+        encoding: str | None = None,
         **kwargs: Any,
     ) -> str:
         """
@@ -167,7 +175,7 @@ class QidianSession(BaseSession):
 
                 async with self.session.get(url, **kwargs) as resp:
                     resp.raise_for_status()
-                    text: str = await resp.text()
+                    text: str = await resp.text(encoding=encoding)
                     return text
             except aiohttp.ClientError:
                 if attempt < self.retry_times:

novel_downloader/core/fetchers/registry.py

@@ -0,0 +1,71 @@
+#!/usr/bin/env python3
+"""
+novel_downloader.core.fetchers.registry
+---------------------------------------
+
+"""
+
+__all__ = ["register_fetcher", "get_fetcher"]
+
+from collections.abc import Callable, Sequence
+from typing import TypeVar
+
+from novel_downloader.core.interfaces import FetcherProtocol
+from novel_downloader.models import FetcherConfig
+
+FetcherBuilder = Callable[[FetcherConfig], FetcherProtocol]
+
+F = TypeVar("F", bound=FetcherProtocol)
+_FETCHER_MAP: dict[str, dict[str, FetcherBuilder]] = {}
+
+
+def register_fetcher(
+    site_keys: Sequence[str],
+    backends: Sequence[str],
+) -> Callable[[type[F]], type[F]]:
+    """
+    Decorator to register a fetcher class under given keys.
+
+    :param site_keys: Sequence of site identifiers
+    :param backends:  Sequence of backend types
+    :return: A class decorator that populates _FETCHER_MAP.
+    """
+
+    def decorator(cls: type[F]) -> type[F]:
+        for site in site_keys:
+            site_lower = site.lower()
+            bucket = _FETCHER_MAP.setdefault(site_lower, {})
+            for backend in backends:
+                bucket[backend] = cls
+        return cls
+
+    return decorator
+
+
+def get_fetcher(
+    site: str,
+    config: FetcherConfig,
+) -> FetcherProtocol:
+    """
+    Returns an FetcherProtocol for the given site.
+
+    :param site: Site name (e.g., 'qidian')
+    :param config: Configuration for the requester
+    :return: An instance of a requester class
+    """
+    site_key = site.lower()
+    try:
+        backend_map = _FETCHER_MAP[site_key]
+    except KeyError as err:
+        raise ValueError(f"Unsupported site: {site!r}") from err
+
+    mode = config.mode
+    try:
+        fetcher_cls = backend_map[mode]
+    except KeyError as err:
+        raise ValueError(
+            f"Unsupported fetcher mode {mode!r} for site {site!r}. "
+            f"Available modes: {list(backend_map)}"
+        ) from err
+
+    return fetcher_cls(config)

novel_downloader/core/fetchers/sfacg/__init__.py

@@ -5,10 +5,10 @@ novel_downloader.core.fetchers.sfacg
 
 """
 
-from .browser import SfacgBrowser
-from .session import SfacgSession
-
 __all__ = [
     "SfacgBrowser",
     "SfacgSession",
 ]
+
+from .browser import SfacgBrowser
+from .session import SfacgSession

novel_downloader/core/fetchers/sfacg/browser.py

@@ -8,10 +8,15 @@ novel_downloader.core.fetchers.sfacg.browser
 from typing import Any
 
 from novel_downloader.core.fetchers.base import BaseBrowser
+from novel_downloader.core.fetchers.registry import register_fetcher
 from novel_downloader.models import FetcherConfig, LoginField
 from novel_downloader.utils.i18n import t
 
 
+@register_fetcher(
+    site_keys=["sfacg"],
+    backends=["browser"],
+)
 class SfacgBrowser(BaseBrowser):
     """
     A browser class for interacting with the Sfacg (m.sfacg.com) novel website.

novel_downloader/core/fetchers/sfacg/session.py

@@ -8,9 +8,14 @@ novel_downloader.core.fetchers.sfacg.session
 from typing import Any
 
 from novel_downloader.core.fetchers.base import BaseSession
+from novel_downloader.core.fetchers.registry import register_fetcher
 from novel_downloader.models import FetcherConfig, LoginField
 
 
+@register_fetcher(
+    site_keys=["sfacg"],
+    backends=["session"],
+)
 class SfacgSession(BaseSession):
     """
     A session class for interacting with the Sfacg (m.sfacg.com) novel website.

novel_downloader/core/fetchers/yamibo/__init__.py

@@ -5,10 +5,10 @@ novel_downloader.core.fetchers.yamibo
 
 """
 
-from .browser import YamiboBrowser
-from .session import YamiboSession
-
 __all__ = [
     "YamiboBrowser",
     "YamiboSession",
 ]
+
+from .browser import YamiboBrowser
+from .session import YamiboSession

novel_downloader/core/fetchers/yamibo/browser.py

@@ -8,9 +8,14 @@ novel_downloader.core.fetchers.yamibo.browser
 from typing import Any
 
 from novel_downloader.core.fetchers.base import BaseBrowser
+from novel_downloader.core.fetchers.registry import register_fetcher
 from novel_downloader.models import FetcherConfig, LoginField
 
 
+@register_fetcher(
+    site_keys=["yamibo"],
+    backends=["browser"],
+)
 class YamiboBrowser(BaseBrowser):
     """
     A browser class for interacting with the Yamibo (www.yamibo.com) novel website.

novel_downloader/core/fetchers/yamibo/session.py

@@ -10,10 +10,15 @@ from typing import Any
 from lxml import html
 
 from novel_downloader.core.fetchers.base import BaseSession
+from novel_downloader.core.fetchers.registry import register_fetcher
 from novel_downloader.models import FetcherConfig, LoginField
-from novel_downloader.utils.time_utils import async_sleep_with_random_delay
+from novel_downloader.utils import async_sleep_with_random_delay
 
 
+@register_fetcher(
+    site_keys=["yamibo"],
+    backends=["session"],
+)
 class YamiboSession(BaseSession):
     """
     A session class for interacting with the Yamibo (www.yamibo.com) novel website.

novel_downloader/core/interfaces/__init__.py

@@ -14,14 +14,16 @@ Included protocols:
 - ExporterProtocol
 """
 
-from .downloader import DownloaderProtocol
-from .exporter import ExporterProtocol
-from .fetcher import FetcherProtocol
-from .parser import ParserProtocol
-
 __all__ = [
     "DownloaderProtocol",
     "ExporterProtocol",
     "FetcherProtocol",
     "ParserProtocol",
+    "SearcherProtocol",
 ]
+
+from .downloader import DownloaderProtocol
+from .exporter import ExporterProtocol
+from .fetcher import FetcherProtocol
+from .parser import ParserProtocol
+from .searcher import SearcherProtocol

novel_downloader/core/interfaces/searcher.py

@@ -0,0 +1,18 @@
+#!/usr/bin/env python3
+"""
+novel_downloader.core.interfaces.searcher
+-----------------------------------------
+
+"""
+
+from typing import Protocol
+
+from novel_downloader.models import SearchResult
+
+
+class SearcherProtocol(Protocol):
+    site_name: str
+
+    @classmethod
+    def search(cls, keyword: str, limit: int | None = None) -> list[SearchResult]:
+        ...

novel_downloader/core/parsers/__init__.py

@@ -14,21 +14,11 @@ Modules:
 - qidian (起点中文网)
 - sfacg (SF轻小说)
 - yamibo (百合会)
-- common (通用架构)
 """
 
-from .biquge import BiqugeParser
-from .common import CommonParser
-from .esjzone import EsjzoneParser
-from .linovelib import LinovelibParser
-from .qianbi import QianbiParser
-from .qidian import QidianParser
-from .sfacg import SfacgParser
-from .yamibo import YamiboParser
-
 __all__ = [
+    "get_parser",
     "BiqugeParser",
-    "CommonParser",
     "EsjzoneParser",
     "LinovelibParser",
     "QianbiParser",
@@ -36,3 +26,12 @@ __all__ = [
     "SfacgParser",
     "YamiboParser",
 ]
+
+from .biquge import BiqugeParser
+from .esjzone import EsjzoneParser
+from .linovelib import LinovelibParser
+from .qianbi import QianbiParser
+from .qidian import QidianParser
+from .registry import get_parser
+from .sfacg import SfacgParser
+from .yamibo import YamiboParser

novel_downloader/core/parsers/{biquge/main_parser.py → biquge.py}

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """
-novel_downloader.core.parsers.biquge.main_parser
-------------------------------------------------
+novel_downloader.core.parsers.biquge
+------------------------------------
 
 """
 
@@ -11,9 +11,14 @@ from typing import Any
 from lxml import html
 
 from novel_downloader.core.parsers.base import BaseParser
+from novel_downloader.core.parsers.registry import register_parser
 from novel_downloader.models import ChapterDict
 
 
+@register_parser(
+    site_keys=["biquge", "bqg"],
+    backends=["session", "browser"],
+)
 class BiqugeParser(BaseParser):
     """ """
 

novel_downloader/core/parsers/{esjzone/main_parser.py → esjzone.py}

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """
-novel_downloader.core.parsers.esjzone.main_parser
--------------------------------------------------
+novel_downloader.core.parsers.esjzone
+-------------------------------------
 
 """
 
@@ -11,9 +11,14 @@ from typing import Any
 from lxml import html
 
 from novel_downloader.core.parsers.base import BaseParser
+from novel_downloader.core.parsers.registry import register_parser
 from novel_downloader.models import ChapterDict
 
 
+@register_parser(
+    site_keys=["esjzone"],
+    backends=["session", "browser"],
+)
 class EsjzoneParser(BaseParser):
     """ """
 

novel_downloader/core/parsers/{linovelib/main_parser.py → linovelib.py}

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """
-novel_downloader.core.parsers.linovelib.main_parser
----------------------------------------------------
+novel_downloader.core.parsers.linovelib
+---------------------------------------
 
 """
 
@@ -13,10 +13,15 @@ from typing import Any
 from lxml import html
 
 from novel_downloader.core.parsers.base import BaseParser
+from novel_downloader.core.parsers.registry import register_parser
 from novel_downloader.models import ChapterDict
 from novel_downloader.utils.constants import LINOVELIB_FONT_MAP_PATH
 
 
+@register_parser(
+    site_keys=["linovelib"],
+    backends=["session", "browser"],
+)
 class LinovelibParser(BaseParser):
     """ """
 

novel_downloader/core/parsers/{qianbi/main_parser.py → qianbi.py}

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """
-novel_downloader.core.parsers.qianbi.main_parser
-------------------------------------------------
+novel_downloader.core.parsers.qianbi
+------------------------------------
 
 """
 
@@ -11,9 +11,14 @@ from typing import Any
 from lxml import html
 
 from novel_downloader.core.parsers.base import BaseParser
+from novel_downloader.core.parsers.registry import register_parser
 from novel_downloader.models import ChapterDict
 
 
+@register_parser(
+    site_keys=["qianbi"],
+    backends=["session", "browser"],
+)
 class QianbiParser(BaseParser):
     """ """
 

novel_downloader/core/parsers/qidian/__init__.py

@@ -5,6 +5,6 @@ novel_downloader.core.parsers.qidian
 
 """
 
-from .main_parser import QidianParser
-
 __all__ = ["QidianParser"]
+
+from .main_parser import QidianParser