Add -f option

c-3lab · Aug 16, 2022 · 24896d6 · 24896d6
1 parent af1f1f5
commit 24896d6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 13 deletions.
diff --git a/dim.ts b/dim.ts
@@ -44,6 +44,10 @@ await new Command()
         "Specify the header. Can specify multiple times.",
         { collect: true },
       )
+      .option(
+        "-f, --file <file:string>",
+        "Specify the dim.json file when installing data.",
+      )
       .option(
         "-F, --force",
         "Forced install. Overwrite already exist data file.",

diff --git a/libs/accessor.ts b/libs/accessor.ts
@@ -9,9 +9,9 @@ import {
 
 export class DimFileAccessor {
   private dimJSON: DimJSON | undefined;
-  constructor() {
-    if (existsSync(DEFAULT_DIM_FILE_PATH)) {
-      this.dimJSON = JSON.parse(Deno.readTextFileSync(DEFAULT_DIM_FILE_PATH));
+  constructor(path = DEFAULT_DIM_FILE_PATH) {
+    if (existsSync(path)) {
+      this.dimJSON = JSON.parse(Deno.readTextFileSync(path));
     } else {
       console.log("Not found a dim.json. You should run a 'dim init'. ");
       Deno.exit(0);

diff --git a/libs/actions.ts b/libs/actions.ts
@@ -56,8 +56,9 @@ const installFromURL = async (
   return result;
 };
 
-const installFromDimFile = async (isUpdate = false) => {
-  let contents = new DimFileAccessor().getContents();
+const installFromDimFile = async (path: string, isUpdate = false) => {
+  let contents = new DimFileAccessor(path).getContents();
+
   if (contents.length == 0) {
     console.log("No contents.\nYou should run a 'dim install <data url>'. ");
     return;
@@ -168,10 +169,17 @@ export class InstallAction {
       postProcesses?: string[];
       name?: string;
       headers?: string[];
+      file?: string;
       force?: boolean;
     },
     url: string | undefined,
   ) {
+    if (url && options.file) {
+      console.log(
+        Colors.red("Cannot use -f option and URL at the same time."),
+      );
+      Deno.exit(1);
+    }
     await createDataFilesDir();
     if (!existsSync(DEFAULT_DIM_LOCK_FILE_PATH)) {
       await initDimLockFile();
@@ -239,7 +247,10 @@ export class InstallAction {
         Colors.green(`Installed to ${fullPath}`),
       );
     } else {
-      const lockContentList = await installFromDimFile(options.force).catch(
+      const lockContentList = await installFromDimFile(
+        options.file || DEFAULT_DIM_FILE_PATH,
+        options.force,
+      ).catch(
         (error) => {
           console.error(
             Colors.red("Failed to install."),
@@ -451,13 +462,18 @@ export class UpdateAction {
         Colors.yellow(fullPath),
       );
     } else {
-      const lockContentList = await installFromDimFile(true).catch((error) => {
-        console.error(
-          Colors.red("Failed to update."),
-          Colors.red(error.message),
-        );
-        Deno.exit(1);
-      });
+      const lockContentList = await installFromDimFile(
+        DEFAULT_DIM_FILE_PATH,
+        true,
+      ).catch(
+        (error) => {
+          console.error(
+            Colors.red("Failed to update."),
+            Colors.red(error.message),
+          );
+          Deno.exit(1);
+        },
+      );
       if (lockContentList !== undefined) {
         await new DimLockFileAccessor().addContents(lockContentList);
       }