Fixed export configuration not working (#23)

Author: jschumme

README.md

@@ -20,13 +20,27 @@ NI DataPlugins: Create new Python-DataPlugin
 
 # Settings
 
+
+
+## Export Path
+Set the export path for all your plugins in Preferences -> Settings -> Extensions -> Vscode-NI-Python-DataPlugins -> Plugin Export Path. The path can be a folder or a *.uri file.
+
+<details>
+<summary>Example</summary>
+<p>
+
 ```json
 {
-    "NI-DataPlugins.PluginExportPath": ""
+    "NI-DataPlugins.PluginExportPath": "C:\\Temp"
+}
+// OR
+{
+    "NI-DataPlugins.PluginExportPath": "C:\\Temp\\MyPlugin.uri"
 }
 ```
 
-**Export-Path** Set the export path for all your plugins in Preferences -> Settings -> Extensions -> Vscode-NI-Python-DataPlugins -> Plugin Export Path 
+</p>
+</details>
 
 # Contribute
 

src/commands.ts

@@ -52,6 +52,7 @@ export async function createDataPlugin(): Promise<DataPlugin | null> {
 }
 
 export async function exportPluginFromContextMenu(uri: vscode.Uri) {
+   let storeFileExtensionsAfterExport: boolean = false;
    const scriptPath: string = uri.fsPath;
    const pluginName: string = path.basename(path.dirname(scriptPath));
 
@@ -70,8 +71,7 @@ export async function exportPluginFromContextMenu(uri: vscode.Uri) {
          return;
       }
 
-      // Store selected extensions so we don't have to ask again
-      fileutils.storeFileExtensionConfig(path.dirname(scriptPath), extensions);
+      storeFileExtensionsAfterExport = true;
    }
 
    let exportPath: string = config.exportPath || '';
@@ -82,9 +82,20 @@ export async function exportPluginFromContextMenu(uri: vscode.Uri) {
       };
 
       const fileInfos = await vscode.window.showSaveDialog({ ...options });
-      exportPath = fileInfos?.fsPath || '';
+      if (!fileInfos) {
+         return;
+      }
+
+      exportPath = fileInfos.fsPath;
+   }
+
+   const isDirectory = path.extname(exportPath) === '';
+   if (isDirectory) {
+      exportPath = path.join(exportPath, `${pluginName}.uri`);
    }
 
    await vscu.exportDataPlugin(scriptPath, extensions.toString(), `${exportPath}`);
 
+   // Store selected extensions so we don't have to ask again
+   fileutils.storeFileExtensionConfig(path.dirname(scriptPath), extensions);
 }

src/file-utils.ts

@@ -38,7 +38,7 @@ export async function readFileExtensionConfig(workspaceDir: string): Promise<str
 export function storeFileExtensionConfig(workspaceDir: string, fileExtensions: string): void {
    const filePath: string = path.join(workspaceDir, '.file-extensions');
    if (fs.existsSync(filePath)) {
-      fs.writeFile(filePath, fileExtensions);
+      fs.writeFileSync(filePath, fileExtensions);
    }
 }