@cloud411716/fancy-webnovel 0.2.19 → 0.2.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud411716/fancy-webnovel",
-  "version": "0.2.19",
+  "version": "0.2.21",
   "type": "module",
   "main": "index.js",
   "exports": {

package/plugins/fancy-scan/scripts/scrapers/jjwxc-rank-scraper.cjs

@@ -139,15 +139,17 @@ async function scrapeRank(rankTypeId, channelId) {
 
     // 布局检测：先找含"序号"/"作者"/"作品"表头的表格，有则为布局A（表格），无为布局B（交替行）
     data = await page.evaluate(() => {
-      // ── 布局 A：表格型（表头含"序号""作者""作品"） ──
+      // ── 布局 A：表格型（表头在第一行 <tr> 的 <td> 里，含"序号""作者""作品"） ──
       var tables = document.querySelectorAll('table');
       for (var ti = 0; ti < tables.length; ti++) {
-        var ths = tables[ti].querySelectorAll('th');
-        var headerText = Array.from(ths).map(function(th) { return th.innerText.trim(); }).join('');
+        var firstRow = tables[ti].querySelector('tr');
+        if (!firstRow) continue;
+        var headerCells = firstRow.querySelectorAll('td,th');
+        var headerText = Array.from(headerCells).map(function(c) { return c.innerText.trim(); }).join('');
         if (headerText.indexOf('序号') >= 0 && headerText.indexOf('作者') >= 0 && headerText.indexOf('作品') >= 0) {
           var rows = tables[ti].querySelectorAll('tr');
           var books = [];
-          for (var ri = 0; ri < rows.length; ri++) {
+          for (var ri = 1; ri < rows.length; ri++) {
             var cells = rows[ri].querySelectorAll('td');
             if (cells.length < 3) continue;
             var rankCell = cells[0].innerText.trim();
@@ -155,10 +157,9 @@ async function scrapeRank(rankTypeId, channelId) {
             var author = cells[1].innerText.trim();
             var titleLink = cells[2].querySelector('a');
             var title = titleLink ? titleLink.innerText.trim() : cells[2].innerText.trim();
-            var novelLink = cells[2].querySelector('a');
             var novelid = '';
-            if (novelLink) {
-              var m = (novelLink.getAttribute('href') || '').match(/novelid=([0-9]+)/);
+            if (titleLink) {
+              var m = (titleLink.getAttribute('href') || '').match(/novelid=([0-9]+)/);
               if (m) novelid = m[1];
             }
             var typeText = cells.length > 3 ? cells[3].innerText.trim() : '';
@@ -292,33 +293,28 @@ async function scrapeRank(rankTypeId, channelId) {
     "",
     `- 来源：${url}`,
     `- 抓取时间：${now}`,
+    `- 条目数：${totalBooks}`,
     "",
     "---",
     "",
   ];
 
   for (const ch of data.channels) {
-  lines.push(`## ${ch.name}`, "");
-  for (let i = 0; i < ch.books.length; i++) {
-    const b = ch.books[i];
-    lines.push(`书名：${b.title || ""}`);
-    lines.push(`作者：${b.author || ""}`);
-    if (data.layout === 'A') {
-      // 布局A（表格型）：已有丰富字段，直接使用
-      if (b.type) lines.push(`类型：${b.type}`);
-      if (b.progress) lines.push(`进度：${b.progress}`);
-      if (b.words) lines.push(`字数：${b.words}`);
-      if (b.score) lines.push(`积分：${b.score}`);
-      if (b.pubtime) lines.push(`发表时间：${b.pubtime}`);
-      lines.push(`题材：${b.type ? b.type.split('-')[1] || b.type : ""}`);
-    } else {
-      // 布局B（交替行型）：只有书名/作者，其他留空让详情补采
-      lines.push(`题材：${ch.name}`);
+    for (let i = 0; i < ch.books.length; i++) {
+      const b = ch.books[i];
+      var genre = '';
+      if (data.layout === 'A' && b.type) {
+        var parts = b.type.split('-');
+        genre = parts[1] || '';
+      } else {
+        genre = ch.name;
+      }
+      lines.push(`书名：${b.title || ""}`);
+      lines.push(`题材：${genre}`);
+      lines.push(`作者：${b.author || ""}`);
+      if (b.novelid) lines.push(`作品页：https://www.jjwxc.net/onebook.php?novelid=${b.novelid}`);
+      lines.push("");
     }
-    if (b.novelid) lines.push(`作品页：https://www.jjwxc.net/onebook.php?novelid=${b.novelid}`);
-    lines.push("");
-  }
-  lines.push("--", "");
   }
 
   return {