novel-downloader 1.4.3__py3-none-any.whl → 1.4.4__py3-none-any.whl

novel_downloader/__init__.py

@@ -6,7 +6,7 @@ novel_downloader
 Core package for the Novel Downloader project.
 """
 
-__version__ = "1.4.3"
+__version__ = "1.4.4"
 
 __author__ = "Saudade Z"
 __email__ = "saudadez217@gmail.com"

novel_downloader/core/fetchers/qidian/browser.py

@@ -22,8 +22,8 @@ class QidianBrowser(BaseBrowser):
 
     HOMEPAGE_URL = "https://www.qidian.com/"
     BOOKCASE_URL = "https://my.qidian.com/bookcase/"
-    BOOK_INFO_URL = "https://book.qidian.com/info/{book_id}/"
-    # BOOK_INFO_URL = "https://www.qidian.com/book/{book_id}/"
+    # BOOK_INFO_URL = "https://book.qidian.com/info/{book_id}/"
+    BOOK_INFO_URL = "https://www.qidian.com/book/{book_id}/"
     CHAPTER_URL = "https://www.qidian.com/chapter/{book_id}/{chapter_id}/"
 
     LOGIN_URL = "https://passport.qidian.com/"

novel_downloader/core/fetchers/qidian/session.py

@@ -27,7 +27,8 @@ class QidianSession(BaseSession):
 
     HOMEPAGE_URL = "https://www.qidian.com/"
     BOOKCASE_URL = "https://my.qidian.com/bookcase/"
-    BOOK_INFO_URL = "https://book.qidian.com/info/{book_id}/"
+    # BOOK_INFO_URL = "https://book.qidian.com/info/{book_id}/"
+    BOOK_INFO_URL = "https://www.qidian.com/book/{book_id}/"
     CHAPTER_URL = "https://www.qidian.com/chapter/{book_id}/{chapter_id}/"
 
     LOGIN_URL = "https://passport.qidian.com/"

novel_downloader/core/parsers/qidian/book_info_parser.py

@@ -10,36 +10,19 @@ time, status, word count, summary, and volume-chapter structure.
 """
 
 import logging
+import re
+from datetime import datetime
 from typing import Any
 
 from lxml import html
 
 logger = logging.getLogger(__name__)
 
-_AUTHOR_XPATH = (
-    'string(//div[contains(@class, "book-info")]//a[contains(@class, "writer")])'
-)
-
 
 def _chapter_url_to_id(url: str) -> str:
     return url.rstrip("/").split("/")[-1]
 
 
-def _get_volume_name(
-    vol_elem: html.HtmlElement,
-) -> str:
-    """
-    Extracts the volume title from a <div class="volume"> element using lxml.
-    Ignores <a> tags, and extracts text from other elements.
-    """
-    h3_candidates = vol_elem.xpath(".//h3")
-    if not h3_candidates:
-        return ""
-    texts = vol_elem.xpath(".//h3//text()[not(ancestor::a)]")
-    full_text = "".join(texts).strip()
-    return full_text.split(chr(183))[0].strip()
-
-
 def parse_book_info(html_str: str) -> dict[str, Any]:
     """
     Extract metadata: title, author, cover_url, update_time, status,
@@ -52,59 +35,53 @@ def parse_book_info(html_str: str) -> dict[str, Any]:
     try:
         doc = html.fromstring(html_str)
 
-        book_name = doc.xpath('string(//h1/em[@id="bookName"])').strip()
-        info["book_name"] = book_name
+        info["book_name"] = doc.xpath('string(//h1[@id="bookName"])').strip()
 
-        author = doc.xpath(_AUTHOR_XPATH).strip()
-        info["author"] = author
+        info["author"] = doc.xpath('string(//a[@class="writer-name"])').strip()
 
-        cover_url = doc.xpath('string(//div[@class="book-img"]//img/@src)').strip()
-        info["cover_url"] = cover_url
+        book_id = doc.xpath('//a[@id="bookImg"]/@data-bid')[0]
+        info[
+            "cover_url"
+        ] = f"https://bookcover.yuewen.com/qdbimg/349573/{book_id}/600.webp"
 
-        update_raw = (
-            doc.xpath('string(//span[contains(@class, "update-time")])')
-            .replace("更新时间", "")
+        ut = (
+            doc.xpath('string(//span[@class="update-time"])')
+            .replace("更新时间:", "")
             .strip()
         )
-        info["update_time"] = update_raw
+        if re.match(r"^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$", ut):
+            info["update_time"] = ut
+        else:
+            info["update_time"] = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
 
-        status = doc.xpath('string(//p[@class="tag"]/span[@class="blue"][1])').strip()
-        info["serial_status"] = status
+        info["serial_status"] = doc.xpath(
+            'string(//p[@class="book-attribute"]/span[1])'
+        ).strip()
 
-        tags = doc.xpath('//p[@class="tag"]/a[@class="red"]/text()')
+        tags = doc.xpath('//p[contains(@class,"all-label")]//a/text()')
         info["tags"] = [t.strip() for t in tags if t.strip()]
 
-        wc_number = doc.xpath("string(//p[em and cite][1]/em[1])").strip()
-        wc_unit = doc.xpath("string(//p[em and cite][1]/cite[1])").strip()
-        info["word_count"] = (
-            (wc_number + wc_unit) if wc_number and wc_unit else "Unknown"
-        )
+        info["word_count"] = doc.xpath('string(//p[@class="count"]/em[1])').strip()
 
         summary = doc.xpath('string(//p[@class="intro"])').strip()
         info["summary_brief"] = summary
 
-        intro_list = doc.xpath('//div[@class="book-intro"]/p')[0]
-        detail_intro = "\n".join(intro_list.itertext()).strip()
-        info["summary"] = detail_intro
+        raw = doc.xpath('//p[@id="book-intro-detail"]//text()')
+        info["summary"] = "\n".join(line.strip() for line in raw if line.strip())
 
         volumes = []
-        for vol_div in doc.xpath('//div[@class="volume-wrap"]/div[@class="volume"]'):
-            volume_name = _get_volume_name(vol_div)
+        for vol in doc.xpath('//div[@id="allCatalog"]//div[@class="catalog-volume"]'):
+            vol_name = vol.xpath('string(.//h3[@class="volume-name"])').strip()
+            vol_name = vol_name.split(chr(183))[0].strip()
             chapters = []
-            for li in vol_div.xpath(".//li"):
-                a = li.xpath(".//a")[0] if li.xpath(".//a") else None
-                if a is None or "href" not in a.attrib:
-                    continue
-                href = a.attrib["href"].strip()
-                title = "".join(a.itertext()).strip()
+            for li in vol.xpath('.//ul[contains(@class,"volume-chapters")]/li'):
+                a = li.xpath('.//a[@class="chapter-name"]')[0]
+                title = a.text.strip()
+                url = a.get("href")
                 chapters.append(
-                    {
-                        "title": title,
-                        "url": href,
-                        "chapterId": _chapter_url_to_id(href),
-                    }
+                    {"title": title, "url": url, "chapterId": _chapter_url_to_id(url)}
                 )
-            volumes.append({"volume_name": volume_name, "chapters": chapters})
+            volumes.append({"volume_name": vol_name, "chapters": chapters})
         info["volumes"] = volumes
 
     except Exception as e:

novel_downloader/tui/screens/login.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """
 novel_downloader.tui.screens.login
----------------------------------
+----------------------------------
 
 """
 

novel_downloader/utils/time_utils/datetime_utils.py

@@ -138,7 +138,7 @@ def calculate_time_difference(
 
     except Exception as e:
         logger.warning("[time] Failed to calculate time difference: %s", e)
-        return 0, 0, 0, 0
+        return 999, 23, 59, 59
 
 
 __all__ = [

{novel_downloader-1.4.3.dist-info → novel_downloader-1.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: novel-downloader
-Version: 1.4.3
+Version: 1.4.4
 Summary: A command-line tool for downloading Chinese web novels from Qidian and similar platforms.
 Author-email: Saudade Z <saudadez217@gmail.com>
 License: MIT License

{novel_downloader-1.4.3.dist-info → novel_downloader-1.4.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-novel_downloader/__init__.py,sha256=JN4ThR5xMeCKx_BPUuZvUrtJJaTH5Tx7ORZZURIY0iY,218
+novel_downloader/__init__.py,sha256=dWsU4eiEbY9H2_GSR5Y5XdVhEH4CyEbDyc7rzVr79qI,218
 novel_downloader/cli/__init__.py,sha256=-2HAut_U1e67MZGdvbpEJ1n5J-bRchzto6L4c-nWeXY,174
 novel_downloader/cli/clean.py,sha256=hOk8SJQwBCw2oOObTdEI79wpnmZ25uB1s9LQK1-4LNU,4487
 novel_downloader/cli/config.py,sha256=C6QLfegZLp4legmu8KenqyYKNdrk47bH0z86ujLP0pY,6509
@@ -63,8 +63,8 @@ novel_downloader/core/fetchers/qianbi/__init__.py,sha256=h4Rve7fO1GcSJ-DlNC5zw7f
 novel_downloader/core/fetchers/qianbi/browser.py,sha256=1EmrSwpqSYhEO_ID3RJbUaAOhcqvVnMnch6iOafXbTA,3162
 novel_downloader/core/fetchers/qianbi/session.py,sha256=c3pJcgi9C1x9QYTBihvazHcgT7XTp2HBYfStTn6gSEg,3141
 novel_downloader/core/fetchers/qidian/__init__.py,sha256=2LshlX82lFpWZMV6yujHsfue9KM0-F1O3HvMCopIv9M,236
-novel_downloader/core/fetchers/qidian/browser.py,sha256=cUgJMrFe_MITHh4MGrDI2-a-MCqXSsoeJsbDus0l2LY,10448
-novel_downloader/core/fetchers/qidian/session.py,sha256=WrHsov15PoRDYbb1ZRaScJQGRZv6axz9_hVEC1Wt1PM,9746
+novel_downloader/core/fetchers/qidian/browser.py,sha256=0L2iUyOlFNmgKtSb89VMrF7L-MjiJy4E6SSKWxzeSC8,10448
+novel_downloader/core/fetchers/qidian/session.py,sha256=dsawkalQGjbS-E9lcOZMTr9qZz6w__gnmAg-uRUtDKI,9809
 novel_downloader/core/fetchers/sfacg/__init__.py,sha256=bQAIwERsX9XOKrP2LteFKX8Jlhw4oeUNwpZTHXn5RRg,230
 novel_downloader/core/fetchers/sfacg/browser.py,sha256=15PVS75PxEKR5W7mQbqVxoN0d4V1XVYVF0l1yy_sv_Y,5681
 novel_downloader/core/fetchers/sfacg/session.py,sha256=9K4emQCRq45vzYn-ZDX549tK2F92x2CBMp4ODohNOjc,5085
@@ -90,7 +90,7 @@ novel_downloader/core/parsers/linovelib/main_parser.py,sha256=LqC6W-Lk7sdbiqhYvq
 novel_downloader/core/parsers/qianbi/__init__.py,sha256=CNmoER8U2u4-ix5S0DDq-pHTtkLR0IZf2SLaTTYXee4,173
 novel_downloader/core/parsers/qianbi/main_parser.py,sha256=kMjGew_dmqjI9oIThyHgxThZZgS3IaESB_tNf1nkCKk,5069
 novel_downloader/core/parsers/qidian/__init__.py,sha256=fWWFeyythX0gpDCJ-2AslrRl2hq4vW2bx9hHh1W7mAw,173
-novel_downloader/core/parsers/qidian/book_info_parser.py,sha256=h5oAVJOOSZMV4U2GnSezVHPJOEUKUic_oD2gl94mEPQ,3721
+novel_downloader/core/parsers/qidian/book_info_parser.py,sha256=TbP8nghoxzBi435cSJKAzWttBRUq49MHw6kn0klfZrU,3056
 novel_downloader/core/parsers/qidian/chapter_encrypted.py,sha256=uIVmRH96O_G0hcvg2nufUQDrZzq_XRhfvB_8YRW22g8,18532
 novel_downloader/core/parsers/qidian/chapter_normal.py,sha256=CClt6zVph7qjZ0HaiYzMPYlcFgnPIY783-SLVIXNL7E,4738
 novel_downloader/core/parsers/qidian/chapter_router.py,sha256=foVMlWtE-qUOvJD_4EDiuAVaNkFdeV_ZTCvS5IL7Orc,1957
@@ -126,7 +126,7 @@ novel_downloader/tui/app.py,sha256=ytV1u15nGCRj_ff_GeAL3W1XlU6r5Lh_k3HBcAjPRx0,7
 novel_downloader/tui/main.py,sha256=MBP8SrwEYTpGQm-V9W_4rKnTeslneORfkzFsU3Xj2yA,256
 novel_downloader/tui/screens/__init__.py,sha256=QsUM5cUEKm7nluQh9acEt37xRWbkZU3vqIpBduepDCU,203
 novel_downloader/tui/screens/home.py,sha256=nH3pRuCOFcSvNV4AYC6RRkWpphmRgY1bNK36OkSVfCg,6994
-novel_downloader/tui/screens/login.py,sha256=eEVmQFZKQX8mCt_qp96QK8t2pB15FeUrk_oV3jm_Mz4,2224
+novel_downloader/tui/screens/login.py,sha256=GK8dXCtH5lGu3ilT1Cv2VmFCwHMspDNpzw0logj2lz0,2225
 novel_downloader/tui/styles/home_layout.tcss,sha256=VNJs339qiwNUuqwwdK6VkYThCdsqlw-2mEoZVCspdrw,974
 novel_downloader/tui/widgets/richlog_handler.py,sha256=bhFb0E7Z7-dRS07y_vMjxjPeCic9AD59MFPLhef_R5g,572
 novel_downloader/utils/__init__.py,sha256=4iUXNUzxeAnGmpGWsB4K_jckUYEW0u_LqWp_OM7mtK8,78
@@ -155,11 +155,11 @@ novel_downloader/utils/text_utils/diff_display.py,sha256=aUvjMcYO-1_P8ZYiYbmYbJO
 novel_downloader/utils/text_utils/font_mapping.py,sha256=Aos5skBhowDdPgnYmK0bpLtNm2hZg3RolNlTkxC9kO8,865
 novel_downloader/utils/text_utils/text_cleaning.py,sha256=zufXt0pc0vnUwgSHD_8LAef3ffqmX9rJ11YzW4rgwLA,2940
 novel_downloader/utils/time_utils/__init__.py,sha256=725vY2PvqFhjbAz0hCOuIuhSCK8HrEqQ_k3YwvubmXo,624
-novel_downloader/utils/time_utils/datetime_utils.py,sha256=1eyX8lTEqkQ-rEej_GrhbUpaIR5tsFdVSKT-q8s9X-g,4927
+novel_downloader/utils/time_utils/datetime_utils.py,sha256=3sPdUjDC7Y7dcX6kaQSBu49BU1tnpERNKq0v9lnD170,4932
 novel_downloader/utils/time_utils/sleep_utils.py,sha256=C4XYeAtxoVZC9Ju6vhhP9sbOrSpdZG2Nm-x1IYO_OFA,3233
-novel_downloader-1.4.3.dist-info/licenses/LICENSE,sha256=XgmnH0mBf-qEiizoVAfJQAKzPB9y3rBa-ni7M0Aqv4A,1066
-novel_downloader-1.4.3.dist-info/METADATA,sha256=MiScyRXyeXncWbjtBIZsFDJqGfL925DraPy7v6TvakQ,7253
-novel_downloader-1.4.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-novel_downloader-1.4.3.dist-info/entry_points.txt,sha256=u1Ns5xI_QJyL4HAFCgJvJdib9ugu7M9I2tnQwZjJxrk,112
-novel_downloader-1.4.3.dist-info/top_level.txt,sha256=hP4jYWM2LTm1jxsW4hqEB8N0dsRvldO2QdhggJT917I,17
-novel_downloader-1.4.3.dist-info/RECORD,,
+novel_downloader-1.4.4.dist-info/licenses/LICENSE,sha256=XgmnH0mBf-qEiizoVAfJQAKzPB9y3rBa-ni7M0Aqv4A,1066
+novel_downloader-1.4.4.dist-info/METADATA,sha256=JrEV-At77txIIajUrfOix5WYcMVvRkhjf5h601ozbVg,7253
+novel_downloader-1.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+novel_downloader-1.4.4.dist-info/entry_points.txt,sha256=u1Ns5xI_QJyL4HAFCgJvJdib9ugu7M9I2tnQwZjJxrk,112
+novel_downloader-1.4.4.dist-info/top_level.txt,sha256=hP4jYWM2LTm1jxsW4hqEB8N0dsRvldO2QdhggJT917I,17
+novel_downloader-1.4.4.dist-info/RECORD,,