Merge pull request #360 from edgardmessias/find_svn

feat: Added option to search the executable of svn

Author: JohnstonCode

src/extension.ts

@@ -1,3 +1,4 @@
+import * as path from "path";
 import {
   commands,
   Disposable,
@@ -83,41 +84,74 @@ async function _activate(context: ExtensionContext, disposables: Disposable[]) {
     outputChannel.show();
   }
 
-  try {
-    await init(context, outputChannel, disposables);
-  } catch (err) {
-    if (!/Svn installation not found/.test(err.message || "")) {
-      throw err;
-    }
-
-    const shouldIgnore =
-      configuration.get<boolean>("ignoreMissingSvnWarning") === true;
+  const tryInit = async () => {
+    try {
+      await init(context, outputChannel, disposables);
+    } catch (err) {
+      if (!/Svn installation not found/.test(err.message || "")) {
+        throw err;
+      }
+
+      const shouldIgnore =
+        configuration.get<boolean>("ignoreMissingSvnWarning") === true;
+
+      if (shouldIgnore) {
+        return;
+      }
+
+      console.warn(err.message);
+      outputChannel.appendLine(err.message);
+      outputChannel.show();
+
+      const findSvnExecutable = "Find SVN executable";
+      const download = "Download SVN";
+      const neverShowAgain = "Don't Show Again";
+      const choice = await window.showWarningMessage(
+        "SVN not found. Install it or configure it using the 'svn.path' setting.",
+        findSvnExecutable,
+        download,
+        neverShowAgain
+      );
 
-    if (shouldIgnore) {
-      return;
+      if (choice === findSvnExecutable) {
+        let filters: { [name: string]: string[] } | undefined;
+
+        // For windows, limit to executable files
+        if (path.sep === "\\") {
+          filters = {
+            svn: ["exe", "bat"]
+          };
+        }
+
+        const executable = await window.showOpenDialog({
+          canSelectFiles: true,
+          canSelectFolders: false,
+          canSelectMany: false,
+          filters
+        });
+
+        if (executable && executable[0]) {
+          const file = executable[0].fsPath;
+
+          outputChannel.appendLine(`Updated "svn.path" with "${file}"`);
+
+          await configuration.update("path", file);
+
+          // Try Re-init after select the executable
+          await tryInit();
+        }
+      } else if (choice === download) {
+        commands.executeCommand(
+          "vscode.open",
+          Uri.parse("https://subversion.apache.org/packages.html")
+        );
+      } else if (choice === neverShowAgain) {
+        await configuration.update("ignoreMissingSvnWarning", true);
+      }
     }
+  };
 
-    console.warn(err.message);
-    outputChannel.appendLine(err.message);
-    outputChannel.show();
-
-    const download = "Download SVN";
-    const neverShowAgain = "Don't Show Again";
-    const choice = await window.showWarningMessage(
-      "SVN not found. Install it or configure it using the 'svn.path' setting.",
-      download,
-      neverShowAgain
-    );
-
-    if (choice === download) {
-      commands.executeCommand(
-        "vscode.open",
-        Uri.parse("https://subversion.apache.org/packages.html")
-      );
-    } else if (choice === neverShowAgain) {
-      await configuration.update("ignoreMissingSvnWarning", true);
-    }
-  }
+  await tryInit();
 }
 
 export async function activate(context: ExtensionContext) {

src/helpers/configuration.ts

@@ -38,8 +38,8 @@ class Configuration {
     return this.configuration.get<T>(section, defaultValue!);
   }
 
-  public update(section: string, value: any): void {
-    this.configuration.update(section, value);
+  public update(section: string, value: any): Thenable<void> {
+    return this.configuration.update(section, value);
   }
 
   public inspect(section: string) {

src/svnFinder.ts

@@ -33,6 +33,7 @@ export class SvnFinder {
             return this.findSpecificSvn("svn");
         }
       })
+      .then(svn => this.checkSvnCommand(svn))
       .then(null, () =>
         Promise.reject(new Error("Svn installation not found."))
       );
@@ -118,4 +119,20 @@ export class SvnFinder {
       );
     });
   }
+
+  public checkSvnCommand(svn: ISvn): Promise<ISvn> {
+    return new Promise<ISvn>((c, e) => {
+      const buffers: Buffer[] = [];
+      const child = cp.spawn(svn.path, ["help", "checkout"]);
+      child.stdout.on("data", (b: Buffer) => buffers.push(b));
+      child.on("error", cpErrorHandler(e));
+      child.on(
+        "exit",
+        code =>
+          code || Buffer.concat(buffers).toString("utf8").length < 100
+            ? e(new Error("Not found"))
+            : c(svn)
+      );
+    });
+  }
 }