fix: download sample app to same folder will overwrite (#1060)

OfficeDev · May 20, 2021 · 33944c0 · 33944c0
1 parent 198143a
commit 33944c0
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/packages/fx-core/src/core/index.ts b/packages/fx-core/src/core/index.ts
@@ -278,6 +278,21 @@ class CoreImpl implements Core {
         if (answer === "Download") {
           const url = samples.data as string;
           const sampleId = samples.id;
+
+          const sampleAppPath = path.join(folder, sampleId);
+          if (
+            (await fs.pathExists(sampleAppPath)) &&
+            (await fs.readdir(sampleAppPath)).length > 0
+          ) {
+            return err(
+              new UserError(
+                error.CoreErrorNames.ProjectFolderExist,
+                `Path ${sampleAppPath} alreay exists. Select a different folder.`,
+                error.CoreSource
+              )
+            );
+          }
+
           const progress = this.ctx.dialog.createProgressBar("Fetch sample app", 2);
           progress.start();
           try {

diff --git a/packages/vscode-extension/src/controls/webviewPanel.ts b/packages/vscode-extension/src/controls/webviewPanel.ts
@@ -87,6 +87,16 @@ export class WebviewPanel {
                 title: "Select folder to download the sample app",
               });
               if (folder !== undefined) {
+                const sampleAppPath = path.join(folder[0].fsPath, msg.data.appFolder);
+                if (
+                  (await fs.pathExists(sampleAppPath)) &&
+                  (await fs.readdir(sampleAppPath)).length > 0
+                ) {
+                  vscode.window.showErrorMessage(
+                    `Path ${sampleAppPath} alreay exists. Select a different folder.`
+                  );
+                  return;
+                }
                 const dialogManager = DialogManager.getInstance();
                 const progress = dialogManager.createProgressBar("Fetch sample app", 2);
                 progress.start();
@@ -102,7 +112,7 @@ export class WebviewPanel {
                     );
                     vscode.commands.executeCommand(
                       "vscode.openFolder",
-                      vscode.Uri.file(path.join(folder[0].fsPath, msg.data.appFolder))
+                      vscode.Uri.file(sampleAppPath)
                     );
                   } else {
                     vscode.window.showErrorMessage("Failed to download sample app");