@cloud411716/fancy-webnovel 1.0.36 → 1.0.37

package/commands/scan/index.js

@@ -55,7 +55,7 @@ const scan = {
       detail: opts.map(o => o.label).join('、'),
       hideCustomInput: true,
       multiSelect: true,
-      options: [...opts, { id: 'cancel', label: '取消' }],
+      options: opts,
     };
   },
 
@@ -173,11 +173,6 @@ export function apply(ctx) {
       const selected = rankResult.answers[0]?.selected ?? [];
       const custom = rankResult.answers[0]?.custom?.trim();
 
-      // "取消" is an explicit option — treat it as cancelled like bootstrap
-      if (selected.includes('取消')) {
-        return notify(session, 'error', scan.notify({ type: 'cancelled' }));
-      }
-
       const rawChoices = selected.length > 0 ? selected : (custom ? [custom] : []);
       if (rawChoices.length === 0) {
         return notify(session, 'error', scan.notify({ type: 'cancelled' }));
@@ -218,12 +213,12 @@ export function apply(ctx) {
       const statusLine = new StatusLine(session);
       let currentRankLabel = '';
 
-      disposers.push(ctx.events.on('fancy/scan:start', (_ctx, platform, _channel, _type, label) => {
+      disposers.push(ctx.events.on('fancy/scan:start', (_ctx, p, _ch, _ty, label) => {
         currentRankLabel = label;
-        statusLine.update(`[${SPINNER[_spinnerIdx++ % 4]}] 正在采集：${platformLabel(platform)} ${label} …`);
+        statusLine.update(`[${SPINNER[_spinnerIdx++ % 4]}] 正在采集：${platformLabel(p)} ${label} …`);
       }));
 
-      disposers.push(ctx.events.on('fancy/scan:rank-done', (_ctx, _platform, _channel, _type, ok, written) => {
+      disposers.push(ctx.events.on('fancy/scan:rank-done', (_ctx, _p, _ch, _ty, ok, written) => {
         statusLine.update(`[${SPINNER[_spinnerIdx++ % 4]}] ${currentRankLabel} ${ok ? `✓ 写入 ${written} 条` : '✗ 失败'}`);
       }));
 

package/index.js

@@ -12,7 +12,7 @@
  *   - File operations use Node.js fs (project roots may be outside workspace).
  *   - ctx.timer (via ctx.timeout()) handles all delays/timeouts.
  *
- * Required Cordis services: commands, userQuestions, timer
+ * Required Cordis services: commands, userQuestions, timer, events, fs
  * (all are part of dsh-base, so this plugin works on dsh-tui, dsh-web, dsh-desktop).
  *
  * IMPORTANT: This plugin needs `danger-full-access` sandbox mode because it
@@ -27,7 +27,7 @@ import { apply as applyScan }      from './commands/scan/index.js';
  * Services this plugin requires from the Cordis context.
  * All are provided by dsh-base, so this works on every DSH UI.
  */
-export const inject = ['commands', 'userQuestions', 'timer'];
+export const inject = ['commands', 'userQuestions', 'timer', 'events', 'fs'];
 
 /**
  * Called once when the plugin is loaded into a Cordis context (fiber).

package/infra.js

@@ -12,9 +12,8 @@
  */
 
 // --------------------------------------------------------------------------
-// notify — return error result propagated through dsh-commands settleThrown()
+// notify — return error/success result propagated through dsh-commands settle()
 // --------------------------------------------------------------------------
-//
 
 /** Strip ANSI escape sequences from a string (defensive, prevents TTY leak). */
 function stripAnsi(str) {
@@ -26,7 +25,7 @@ function stripAnsi(str) {
  * @param {'error'|'success'} kind
  * @param {string} text
  * @returns {{ kind: 'error'|'success', text: string }} Result propagated through
- *   dsh-commands settleThrown() → command/done → channel.notify() (TUI toast)
+ *   dsh-commands settle() → command/done → channel.notify() (TUI toast)
  *   and command/done (Web left-panel with real commandId prefix)
  */
 export function notify(session, kind, text) {
@@ -122,18 +121,18 @@ export function scanProgress(ctx, phase, data) {
   switch (phase) {
     case 'start':
       ctx.events.emit('fancy/scan:start', data.platform, data.channel, data.type, data.label);
-      break
+      break;
     case 'book':
       ctx.events.emit('fancy/scan:book', data.platform, data.channel, data.type,
         data.index, data.total, data.title, data.rank);
-      break
+      break;
     case 'rank-done':
       ctx.events.emit('fancy/scan:rank-done', data.platform, data.channel, data.type,
         data.ok, data.written, data.failed, data.errorMsg);
-      break
+      break;
     case 'done':
       ctx.events.emit('fancy/scan:done', data.platform, data.totalBooks, data.totalFiles, data.ok);
-      break
+      break;
   }
 }
 
@@ -156,5 +155,3 @@ export async function writeFile(filepath, content, encoding = 'utf-8') {
   mkdirSync(dirname(filepath), { recursive: true });
   writeFileSync(filepath, content, encoding);
 }
-
-

package/package.json

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