Support for fallback to a defaultDir. Closes #2

cross-org · Mar 23, 2024 · da38499 · da38499
1 parent 1a40625
commit da38499
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -159,7 +159,7 @@ export const directoryConfig: { [key in DirectoryTypes]: DirectoryPathConfig } =
     },
     [DirectoryTypes.tmp]: {
         windows: [{ key: "TMP" }],
-        linux: [{ key: "TMPDIR" }],
+        linux: [{ key: "TMPDIR", defaultDir: "/tmp" }],
         macos: [{ key: "TMPDIR" }],
     },
     [DirectoryTypes.video]: {
@@ -173,22 +173,26 @@ export const directoryConfig: { [key in DirectoryTypes]: DirectoryPathConfig } =
  * Configuration item for Windows directory paths.
  * @property {string} key -  Environment variable name
  * @property {string} [extraFolder] - Optional subfolder to append
+ * @property {string} [defaultDir] - Optional default directory if "key" is undefined
  * @property {boolean} [winSpecialFolder] - Indicates if a Windows special folder
  */
 type WindowsDirectoryPathConfigItem = {
     key: string;
     extraFolder?: string;
+    defaultDir?: string;
     winSpecialFolder?: boolean;
 };
 
 /**
  * Configuration item for Unix (Linux/macOS) directory paths.
  * @property {string} key -  Environment variable name
  * @property {string} [extraFolder] - Optional subfolder to append
+ * @property {string} [defaultDir] - Optional default directory if "key" is undefined
  */
 type UnixDirectoryPathConfigItem = {
     key: string;
     extraFolder?: string;
+    defaultDir?: string;
 };
 
 /**

diff --git a/src/dir.ts b/src/dir.ts
@@ -38,25 +38,23 @@ export async function dir(type: string): Promise<string> {
     }
 
     for (const config of configs) {
+        let baseEnv;
         if (platform === "windows" && isWindowsConfigItem(config)) {
             const ps = await spawn([
                 "powershell",
                 "-Command",
                 `[Environment]::GetFolderPath('${config.key}')`,
             ]);
-            const baseEnv = ps.stdout.trim();
-
-            if (baseEnv) {
-                const fullPath = config.extraFolder ? `${baseEnv}${config.extraFolder}` : baseEnv;
-                return fullPath;
-            }
+            baseEnv = ps.stdout.trim();
         } else {
-            // Handle non-Windows logic
-            const baseEnv = getEnv(config.key);
-            if (baseEnv) {
-                const fullPath = config.extraFolder ? `${baseEnv}${config.extraFolder}` : baseEnv;
-                return fullPath;
-            }
+            baseEnv = getEnv(config.key);
+        }
+
+        if (baseEnv) {
+            const fullPath = config.extraFolder ? `${baseEnv}${config.extraFolder}` : baseEnv;
+            return fullPath;
+        } else if (config.defaultDir) {
+            return config.defaultDir;
         }
     }