fix: should run tasks by inputs

tychenjiajun · Sep 14, 2024 · 427d915 · 427d915
1 parent 86a0efa
commit 427d915
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 24 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "exif-ai",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "A Node.js CLI and library that uses Ollama or ZhipuAI to intelligently write image description and/or tags to exif metadata by it's content.",
   "homepage": "https://github.com/tychenjiajun/exif-ai",
   "repository": {

diff --git a/src/exif-ai.ts b/src/exif-ai.ts
@@ -31,7 +31,7 @@ async function findFilesRecursive(
 }
 const program = new Command();
 program
-  .version("3.0.6")
+  .version("3.0.7")
   .description(getText("description") ?? "")
   .requiredOption("-a, --api-provider <provider>", getText("api-provider"))
   .option("-T, --tasks <tasks...>", getText("tasks"))

diff --git a/src/index.ts b/src/index.ts
@@ -137,26 +137,30 @@ export async function execute({
     if (verbose) console.log("Imported provider:", provider);
 
     const [description, tags] = await Promise.all([
-      getDescription({
-        buffer,
-        model,
-        prompt: descriptionPrompt,
-        providerArgs,
-        providerModule,
-        verbose,
-        descriptionTags,
-        existingTags,
-      }),
-      getTags({
-        buffer,
-        model,
-        prompt: descriptionPrompt,
-        providerArgs,
-        providerModule,
-        verbose,
-        tagTags,
-        existingTags,
-      }),
+      tasks.includes("description")
+        ? getDescription({
+            buffer,
+            model,
+            prompt: descriptionPrompt,
+            providerArgs,
+            providerModule,
+            verbose,
+            descriptionTags,
+            existingTags,
+          })
+        : undefined,
+      tasks.includes("tag") || tasks.includes("tags")
+        ? getTags({
+            buffer,
+            model,
+            prompt: descriptionPrompt,
+            providerArgs,
+            providerModule,
+            verbose,
+            tagTags,
+            existingTags,
+          })
+        : undefined,
     ]);
 
     if (dry) {

diff --git a/test/index.test.ts b/test/index.test.ts
@@ -15,6 +15,9 @@ import { deleteAsync } from "del";
 
 let i = 0;
 
+const getDescription = vi.fn(async ({ prompt }: { prompt: string }) => prompt); // Return the prompt as the description
+const getTags = vi.fn(async ({ prompt }: { prompt: string }) => prompt); // Return the prompt as the tags
+
 describe("Image Processing Tests", () => {
   const baseOptions = {
     path: "./test/image0.jpeg",
@@ -46,7 +49,8 @@ describe("Image Processing Tests", () => {
     );
     // Mock the provider module
     vi.doMock("provider1", () => ({
-      getDescription: async ({ prompt }: { prompt: string }) => prompt, // Return the prompt as the description
+      getDescription,
+      getTags,
     }));
   });
 
@@ -136,6 +140,7 @@ describe("Image Processing Tests", () => {
       ...baseOptions,
       tasks: [],
     });
+
     // Verify the existing tag is not overwritten
     const descriptionTags = await exiftool.read(resolvedPath);
     expect(descriptionTags.XPComment).to.equal("Existing comment");
@@ -180,7 +185,7 @@ describe("Image Processing Tests", () => {
     await exiftool.write(resolvedPath, { XPComment: "Existing comment" });
     await execute({
       ...baseOptions,
-      provider: 'invalid',
+      provider: "invalid",
     });
     // Verify the existing tag is not overwritten
     const descriptionTags = await exiftool.read(resolvedPath);