bump

dev/index.ts

@@ -27,7 +27,7 @@ app.plugin(ExtrasInDev);
 
 // Target plugin
 app.plugin(TargetPlugin, {
-  sources: [{ name: 'ygopro', isDefault: true, path: './dev/test-pics' }],
+  instances: [{ name: 'ygopro', isDefault: true, path: './dev/test-pics' }],
 });
 
 app.start();

package.json

@@ -32,8 +32,8 @@
     "read-dir-deep": "^7.0.1"
   },
   "peerDependencies": {
-    "koishi": "^4.6.0",
-    "koishi-plugin-pics": "^9.0.0"
+    "koishi": "^4.6.1",
+    "koishi-plugin-pics": "^9.0.3"
   },
   "devDependencies": {
     "@koishijs/plugin-cache-lru": "^1.0.0-rc.0",

src/LocalSource.ts

-import { PicResult, PicSource } from 'koishi-plugin-pics';
-import { Context, Random } from 'koishi';
-import path from 'path';
-import { readDirDeep } from 'read-dir-deep';
-import fs from 'fs';
-import { LocalSourceConfig } from './config';
-
-export class LocalSource extends PicSource {
-  constructor(ctx: Context, private config: LocalSourceConfig) {
-    super(ctx);
-    config.applyTo(this);
-  }
-
-  async randomPic(picTags: string[]): Promise<PicResult> {
-    const absolutePath = path.resolve(process.cwd(), this.config.path);
-    const files = (
-      await readDirDeep(absolutePath, {
-        absolute: true,
-        patterns: this.config.patterns,
-        gitignore: false,
-        ignore: this.config.exclude,
-      })
-    ).filter((f) => picTags.every((t) => f.includes(t)));
-    if (!files.length) {
-      return null;
-    }
-    const filename = Random.pick(files);
-    const fileBase64 = (await fs.promises.readFile(filename)).toString(
-      'base64',
-    );
-    return {
-      url: `base64://${fileBase64}`,
-      description: this.config.displayFilename
-        ? path.basename(filename)
-        : undefined,
-    };
-  }
-}

src/config.ts

 // import 'source-map-support/register';
-import { PicSourceConfig, PicSourceInfo } from 'koishi-plugin-pics';
-import { Context } from 'koishi';
-import { LocalSource } from './LocalSource';
+import { PicSourceConfig } from 'koishi-plugin-pics';
 import { DefineSchema, RegisterSchema } from 'schemastery-gen';
 
-export interface LocalSourceConfigLike extends PicSourceInfo {
-  path: string;
-  patterns?: string[];
-  exclude?: string[];
-  displayFilename?: boolean;
-}
-
 @RegisterSchema()
-export class LocalSourceConfig
-  extends PicSourceConfig
-  implements LocalSourceConfigLike
-{
-  constructor(config: LocalSourceConfigLike) {
+export class LocalSourceConfig extends PicSourceConfig {
+  constructor(config: Partial<LocalSourceConfig>) {
     super(config);
   }
   @DefineSchema({ description: '目录路径', required: true })
@@ -43,27 +31,4 @@ export class LocalSourceConfig
   exclude: string[];
   @DefineSchema({ description: '是否显示文件名', default: true })
   displayFilename: boolean;
-
-  registerInstance(ctx: Context) {
-    const instance = new LocalSource(ctx, this);
-    ctx
-      .logger('picsource-localfs')
-      .info(`Registered localfs pic source ${instance.name}.`);
-    ctx.pics.addSource(instance, ctx);
-  }
-}
-
-export interface PicSourceLocalFSPluginConfigLike {
-  sources: LocalSourceConfigLike[];
-}
-
-export class PicSourceLocalFSPluginConfig
-  implements PicSourceLocalFSPluginConfigLike
-{
-  @DefineSchema({
-    description: '目录定义',
-    type: LocalSourceConfig,
-    required: true,
-  })
-  sources: LocalSourceConfig[];
 }

src/index.ts

-// import 'source-map-support/register';
+import { Random } from 'koishi';
 import {
-  PicSourceLocalFSPluginConfig,
-  PicSourceLocalFSPluginConfigLike,
-} from './config';
-import {
-  BasePlugin,
-  DefinePlugin,
-  LifecycleEvents,
-  UsingService,
-} from 'koishi-thirdeye';
+  DefineMultiSourcePlugin,
+  PicResult,
+  PicSourcePlugin,
+} from 'koishi-plugin-pics';
+import { DefinePlugin } from 'koishi-thirdeye';
+import path from 'path';
+import { readDirDeep } from 'read-dir-deep';
+import { LocalSourceConfig } from './config';
+import fs from 'fs';
 
-@UsingService('pics')
-@DefinePlugin({
-  name: 'picsource-localfs',
-  schema: PicSourceLocalFSPluginConfig,
-})
-export default class PicSourceLocal
-  extends BasePlugin<
-    PicSourceLocalFSPluginConfig,
-    PicSourceLocalFSPluginConfigLike
-  >
-  implements LifecycleEvents
-{
-  onApply() {
-    this.config.sources.forEach((s) => s.registerInstance(this.ctx));
+@DefinePlugin({ name: 'picsource-local', schema: LocalSourceConfig })
+export class LocalSource extends PicSourcePlugin<LocalSourceConfig> {
+  async randomPic(picTags: string[]): Promise<PicResult> {
+    const absolutePath = path.resolve(process.cwd(), this.config.path);
+    const files = (
+      await readDirDeep(absolutePath, {
+        absolute: true,
+        patterns: this.config.patterns,
+        gitignore: false,
+        ignore: this.config.exclude,
+      })
+    ).filter((f) => picTags.every((t) => f.includes(t)));
+    if (!files.length) {
+      return null;
+    }
+    const filename = Random.pick(files);
+    const fileBase64 = (await fs.promises.readFile(filename)).toString(
+      'base64',
+    );
+    return {
+      url: `base64://${fileBase64}`,
+      description: this.config.displayFilename
+        ? path.basename(filename)
+        : undefined,
+    };
   }
 }
+
+export default class LocalSourcePlugin extends DefineMultiSourcePlugin(
+  LocalSource,
+  LocalSourceConfig,
+) {}