Merge branch 'rewrite'

Author: nickrallison

src/managers/scriptManager.ts

@@ -54,6 +54,11 @@ export class ScriptManager {
         }
 
         let scriptStartTime = Date.now();
+        if (scriptConfig.runDirectory) {
+            basePath = path.join(basePath, scriptConfig.runDirectory);
+        } 
+        process.chdir(basePath);
+        console.log(`Running script: ${cmd} from ${basePath}`);
         exec(cmd, (error, stdout, stderr) => {
             // Handle output based on scriptConfig.output
             if (scriptConfig.output?.type === 'notice') {
@@ -117,8 +122,6 @@ export class ScriptManager {
 
     private isExecutable(filePath: string): boolean {
         try {
-            // Check if the file exists
-            fs.accessSync(filePath, fs.constants.F_OK);
             // On Windows, check if the file has an executable extension
             if (process.platform === 'win32') {
                 const executableExtensions = ['.exe', '.bat', '.cmd'];
@@ -128,8 +131,10 @@ export class ScriptManager {
                     return false;
                 }
             }
-            // Check if the file is executable
-            fs.accessSync(filePath, fs.constants.X_OK);
+            if (process.platform !== 'win32') {
+                // On Unix-based systems, check if the file has the executable permission
+                fs.accessSync(filePath, fs.constants.F_OK | fs.constants.X_OK);
+            }
             return true;
         } catch (error) {
             // If the file doesn't exist, check if it's in the PATH

src/modals/scriptSettingsModal.ts

@@ -26,6 +26,17 @@ export class ScriptSettingsModal extends Modal {
         contentEl.empty(); // Clear the modal content
         contentEl.createEl('h2', { text: `Settings for ${this.scriptPath}` });
 
+        // Run Directory setting
+        new Setting(contentEl)
+            .setName('Run Directory')
+            .setDesc('Specify the directory relative to the vault root to run the script in. (Defaults to the vault root directory)')
+            .addText(text => {
+                text.setValue(this.scriptConfig.runDirectory || '')
+                    .onChange(value => {
+                        this.scriptConfig.runDirectory = value;
+                    });
+            });
+
         // Interpreter setting
         new Setting(contentEl)
             .setName('Interpreter')

src/settings/scriptSettings.ts

@@ -1,6 +1,7 @@
 // src/settings/scriptSettings.ts
 export interface ScriptSettings {
     interpreter?: string;
+    runDirectory?: string;  // Directory to run the script in
     arguments?: {
         currentFile?: boolean; // Include current file path
         vaultPath?: boolean;   // Include vault path

src/settings/scriptSettingsTab.ts

@@ -45,6 +45,9 @@ export class ScriptSettingsTab extends PluginSettingTab {
                 // Convert absolute paths to relative paths from scripts folder
                 return file.replace(scriptsFolder + "/", "");
             });
+
+            // cut all .git folders
+            items.folders = items.folders.filter((folder) => !folder.includes('.git'));
 
             // Recursively process subdirectories
             for (const folder of items.folders) {

yarn.lock

@@ -18,10 +18,15 @@
     style-mod "^4.1.0"
     w3c-keyname "^2.2.4"
 
-"@esbuild/darwin-arm64@0.17.3":
+"@esbuild/linux-x64@0.17.3":
   version "0.17.3"
-  resolved "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.3.tgz"
-  integrity sha512-01Hxaaat6m0Xp9AXGM8mjFtqqwDjzlMP0eQq9zll9U85ttVALGCGDuEvra5Feu/NbP5AEP1MaopPwzsTcUq1cw==
+  resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.3.tgz"
+  integrity sha512-0AGkWQMzeoeAtXQRNB3s4J1/T2XbigM2/Mn2yU1tQSmQRmHIZdkGbVq2A3aDdNslPyhb9/lH0S5GMTZ4xsjBqg==
+
+"@esbuild/[email protected]":
+  version "0.17.3"
+  resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.3.tgz"
+  integrity sha512-FdVl64OIuiKjgXBjwZaJLKp0eaEckifbhn10dXWhysMJkWblg3OEEGKSIyhiD5RSgAya8WzP3DNkngtIg3Nt7g==
 
 "@eslint-community/eslint-utils@^4.2.0":
   version "4.4.1"