perf: 优化创建worktree流程

jackiotyu · Jun 17, 2024 · 7658782 · 7658782
1 parent dbdc72f
commit 7658782
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/images/overview.png b/images/overview.png
diff --git a/l10n/bundle.l10n.zh-cn.json b/l10n/bundle.l10n.zh-cn.json
@@ -111,5 +111,5 @@
     "Open worktree list": "打开 worktree 列表",
     "Input worktree directory": "输入 worktree 文件夹",
     "Please select a different directory": "请选择其他文件夹",
-    "The folder already exists": "文件夹已存在"
+    "The folder is not empty": "所选文件夹中有文件"
 }
diff --git a/src/core/ui/inputWorktreeDir.ts b/src/core/ui/inputWorktreeDir.ts
@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 import path from 'path';
-import { checkExist } from '@/core/util/file';
+import { checkExist, isDirEmpty } from '@/core/util/file';
 import { comparePath } from '@/core/util/folder';
 import { Alert } from '@/core/ui/message';
 
@@ -92,8 +92,8 @@ export const inputWorktreeDir = async ({ baseDir, baseWorktreeDir, step, totalSt
             const input = inputBox.value;
             if (!input) return;
             if (verifySameDir(input, workTreeDir)) return;
-            if (await checkExist(input)) {
-                return Alert.showErrorMessage(vscode.l10n.t('The folder already exists'));
+            if (!(await isDirEmpty(input))) {
+                return Alert.showErrorMessage(vscode.l10n.t('The folder is not empty'));
             }
             resolve(input);
             inputBox.hide();

diff --git a/src/core/util/file.ts b/src/core/util/file.ts
@@ -16,4 +16,11 @@ export const verifyDirExistence = async (path: string) => {
         return false;
     }
     return true;
-};
+};
+
+export function isDirEmpty(path: string) {
+    return fs
+        .readdir(path)
+        .then((res) => res.length === 0)
+        .catch(() => true);
+}