@cloud411716/fancy-webnovel 0.2.27 → 0.2.28

package/package.json

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

package/plugins/fancy-scan/index.js

@@ -73,8 +73,8 @@ export async function apply(ctx) {
           : (row[2] === '长篇' ? 'long' : 'short');
       }
 
-      // 知乎/七猫二次选择篇幅
-      if (platform === 'zhihu' || platform === 'qimao') {
+      // 知乎二次选择篇幅（保持原逻辑）
+      if (platform === 'zhihu') {
         if (!length || !['long', 'short'].includes(length)) {
           const lenResult = await ctx.userQuestions.ask({
             questions: [scan.askLength(platform)],
@@ -90,9 +90,30 @@ export async function apply(ctx) {
         length = 'long';
       }
 
+      // 七猫二次选择（男/女频 × 大热/新书榜）
+      if (platform === 'qimao') {
+        const lenResult = await ctx.userQuestions.ask({
+          questions: [scan.askLength(platform)],
+        });
+        const lenAnswer = lenResult.answers[0]?.selected?.[0] ?? lenResult.answers[0]?.custom;
+        if (!lenAnswer || lenAnswer === '取消') {
+          notify(session, scan.notify({ type: 'cancelled' }));
+          return { kind: 'success', text: '' };
+        }
+        // 把选项标签映射成 channel + type，存入 ctx.options 供 runScanWithChromiumFix 传递
+        const qimaoMap = {
+          '采集全部（男/女 × 大热/新书，4个榜单）': { channel: 'all', type: 'all' },
+          '男生大热榜': { channel: 'male', type: 'hot' },
+          '男生新书榜': { channel: 'male', type: 'new' },
+          '女生大热榜': { channel: 'female', type: 'hot' },
+          '女生新书榜': { channel: 'female', type: 'new' },
+        };
+        ctx._qimaoOverride = qimaoMap[lenAnswer] || { channel: 'all', type: 'all' };
+      }
+
       // 执行采集，包含 Chromium 缺失处理
       const scanResult = await runScanWithChromiumFix(ctx, session, invocation, {
-        platform, length, projectRoot,
+        platform, length, projectRoot, qimaoOverride: ctx._qimaoOverride || null,
       });
 
       if (scanResult === 'retry') {
@@ -112,14 +133,19 @@ export async function apply(ctx) {
  * 执行采集，检测 Chromium 缺失则提示用户手动安装。
  * 返回 undefined 表示已处理完毕（取消/失败），返回 'retry' 表示重试完成。
  */
-async function runScanWithChromiumFix(ctx, session, invocation, { platform, length, projectRoot }) {
+async function runScanWithChromiumFix(ctx, session, invocation, { platform, length, projectRoot, qimaoOverride = null }) {
   const runOnce = async (isRetry = false) => {
     const stop = startActivity(session);
     if (isRetry) notify(session, '⏳ 重新采集...\n');
+    const extraArgs = [];
+    if (platform === 'qimao' && qimaoOverride) {
+      extraArgs.push('--channel', qimaoOverride.channel, '--type', qimaoOverride.type);
+    }
     const r = await spawnScript(
       'node',
       [join(SCAN_SCRIPTS_DIR, 'run-scan.js'),
-       '--project-root', projectRoot, '--platform', platform, '--length', length],
+       '--project-root', projectRoot, '--platform', platform, '--length', length,
+       ...extraArgs],
       { timeout: 900000, stop }
     );
     return r;

package/plugins/fancy-scan/scripts/run-scan.js

@@ -28,7 +28,7 @@ const PLATFORM_SUPPORTED_LENGTHS = {
   fanqie:   ['long'],
   jinjiang: ['long'],
   zhihu:    ['long', 'short'],
-  qimao:    ['long', 'short'],
+  qimao:    ['long'],
 };
 
 const PLATFORM_CN = {
@@ -163,10 +163,10 @@ function renderQidianMarkdown(rankLabel, url, books) {
 // Browser scraper spawner（调用 scripts/scrapers/ 下的 CJS 脚本）
 // ---------------------------------------------------------------------------
 
-function spawnScraper(platform, length, outDir) {
+function spawnScraper(platform, length, outDir, channel, type) {
   return new Promise(async (resolve) => {
     const { spawn } = await import('child_process');
-    const args = scraperArgs(platform, length, outDir);
+    const args = scraperArgs(platform, length, outDir, channel, type);
     const scraperScript = join(dirname(fileURLToPath(import.meta.url)), 'scrapers', args.script);
     const fullArgs = [...args.extra];
 
@@ -191,7 +191,7 @@ function spawnScraper(platform, length, outDir) {
   });
 }
 
-function scraperArgs(platform, length, outDir) {
+function scraperArgs(platform, length, outDir, channel, type) {
   switch (platform) {
     case 'fanqie':
       return {
@@ -212,9 +212,8 @@ function scraperArgs(platform, length, outDir) {
     case 'qimao':
       return {
         script: 'qimao-rank-scraper.cjs',
-        extra: ['--outdir', outDir],
+        extra: ['--channel', channel || 'all', '--type', type || 'all', '--outdir', outDir],
       };
-      return { script: null, extra: [] };
     default:
       return { script: null, extra: [] };
   }
@@ -316,12 +315,14 @@ function appendTopicDecision(platform, length, reportFile, outDir) {
 
 async function main() {
   const args = process.argv.slice(2);
-  let projectRoot = '', platform = '', length = '';
+  let projectRoot = '', platform = '', length = '', channel = '', type = '';
 
   for (let i = 0; i < args.length; i++) {
     if (args[i] === '--project-root') projectRoot = args[i + 1] || '';
     if (args[i] === '--platform') platform = args[i + 1] || '';
     if (args[i] === '--length') length = args[i + 1] || '';
+    if (args[i] === '--channel') channel = args[i + 1] || 'all';
+    if (args[i] === '--type') type = args[i + 1] || 'all';
   }
 
   if (!projectRoot || !platform || !length) {
@@ -373,7 +374,7 @@ async function main() {
       process.exit(1);
     }
     console.error(`→ 采集 ${PLATFORM_CN[platform]}...`);
-    const result = await spawnScraper(platform, length, scanDir);
+    const result = await spawnScraper(platform, length, scanDir, channel, type);
     if (!result.ok) {
       console.error(`  ❌ ${PLATFORM_CN[platform]} 采集失败：${result.error}`);
       process.exit(1);

package/plugins/fancy-scan/templates.js

@@ -37,6 +37,19 @@ export const scan = {
   },
 
   askLength(platform) {
+    if (platform === 'qimao') {
+      return {
+        question: `七猫同时支持男频/女频、大热榜/新书榜，请选择采集范围：`,
+        hideCustomInput: true,
+        options: [
+          { label: '采集全部（男/女 × 大热/新书，4个榜单）' },
+          { label: '男生大热榜' },
+          { label: '男生新书榜' },
+          { label: '女生大热榜' },
+          { label: '女生新书榜' },
+        ],
+      };
+    }
     return {
       question: `${platformLabel(platform)} 同时支持长篇和短篇，请选择：`,
       hideCustomInput: true,