添加了本地和git的区分

2025-11-28 14:16:19 +08:00
parent 17e9dc1451
commit 2fd84439b7
9 changed files with 355 additions and 212 deletions
--- a/out/panels/ConfigPanel.js
+++ b/out/panels/ConfigPanel.js
@@ -218,10 +218,10 @@ class ConfigPanel {
                        await this.deleteModuleFolder(data.folderId);
                        break;
                    case 'openMergedFolderInVSCode':
-                        await this.openTheModuleFolder('merged', data.folderId);
+                        await this.openTheModuleFolder('local', data.folderId);
                        break;
                    case 'loadMergedFolder':
-                        await this.openTheModuleFolder('merged', data.folderId);
+                        await this.openTheModuleFolder('local', data.folderId);
                        break;
                    case 'openTheModuleFolder':
                        await this.openTheModuleFolder(data.moduleType, data.id);
@@ -317,7 +317,7 @@ class ConfigPanel {
    /**
     * 添加 Git 模块文件夹到容器目录
     */
-    async addGitModuleFolder(url, name, branch) {
+    async addGitModuleFolder(url, displayName, folderName, branch) {
        try {
            // 验证 URL
            if (!url || !url.startsWith('http')) {
@@ -345,52 +345,63 @@ class ConfigPanel {
                vscode.window.showErrorMessage('未找到项目路径');
                return;
            }
-            // 构建相对路径（从项目路径开始）
-            const relativePath = `/${aircraft.projectId}/${aircraft.name}/${container.name}/${name}`;
-            // 完整路径用于实际操作
-            const localPath = path.join(projectPath, aircraft.name, container.name, name);
-            console.log(`📁 Git模块文件夹将保存到: ${localPath}`);
+            // 构建相对路径（从项目路径开始）- 使用 folderName 作为实际文件夹名
+            const relativePath = `/${aircraft.projectId}/${aircraft.name}/${container.name}/${folderName}`;
+            // 完整路径用于实际操作 - 使用 folderName 作为实际文件夹名
+            const localPath = path.join(projectPath, aircraft.name, container.name, folderName);
+            console.log(`📁 准备克隆仓库: ${displayName}, 分支: ${branch}, 路径: ${localPath}`);
            console.log(`📁 相对路径: ${relativePath}`);
-            // 检查是否已存在相同名称的模块文件夹
-            const existingFolder = this.moduleFolders.find(folder => folder.name === name && folder.containerId === this.currentContainerId);
+            // 修复：检查是否已存在相同实际路径的模块文件夹，而不是显示名称
+            const existingFolder = this.moduleFolders.find(folder => folder.localPath === relativePath && folder.containerId === this.currentContainerId);
            if (existingFolder) {
-                vscode.window.showWarningMessage('该名称的模块文件夹已存在');
+                vscode.window.showWarningMessage(`该路径的模块文件夹已存在: ${folderName}`);
                return;
            }
            const newFolder = {
                id: folderId,
-                name: name,
+                name: displayName,
                type: 'git',
                localPath: relativePath,
                containerId: this.currentContainerId
            };
-            console.log(`📁 准备克隆仓库: ${name}, 分支: ${branch}, 路径: ${localPath}`);
            // 显示进度
            await vscode.window.withProgress({
                location: vscode.ProgressLocation.Notification,
-                title: `正在克隆仓库: ${name}`,
+                title: `正在克隆仓库: ${displayName}`,
                cancellable: false
            }, async (progress) => {
                progress.report({ increment: 0 });
                try {
-                    // 确保目录存在
-                    await fs.promises.mkdir(localPath, { recursive: true });
-                    // 检查目录是否为空
-                    const dirContents = await fs.promises.readdir(localPath);
-                    if (dirContents.length > 0) {
-                        const confirm = await vscode.window.showWarningMessage(`目标目录不为空，确定要覆盖吗？`, { modal: true }, '确定覆盖', '取消');
-                        if (confirm !== '确定覆盖') {
-                            vscode.window.showInformationMessage('克隆操作已取消');
-                            return;
-                        }
-                        // 清空目录（除了 .git 文件夹，如果存在的话）
-                        for (const item of dirContents) {
-                            const itemPath = path.join(localPath, item);
-                            if (item !== '.git') {
-                                await fs.promises.rm(itemPath, { recursive: true, force: true });
+                    // 确保父目录存在
+                    const parentDir = path.dirname(localPath);
+                    await fs.promises.mkdir(parentDir, { recursive: true });
+                    // 检查目标目录是否已存在
+                    let dirExists = false;
+                    try {
+                        await fs.promises.access(localPath);
+                        dirExists = true;
+                    }
+                    catch {
+                        dirExists = false;
+                    }
+                    if (dirExists) {
+                        const dirContents = await fs.promises.readdir(localPath);
+                        if (dirContents.length > 0) {
+                            const confirm = await vscode.window.showWarningMessage(`目标目录 "${folderName}" 不为空，确定要覆盖吗？`, { modal: true }, '确定覆盖', '取消');
+                            if (confirm !== '确定覆盖') {
+                                vscode.window.showInformationMessage('克隆操作已取消');
+                                return;
+                            }
+                            // 清空目录（除了 .git 文件夹，如果存在的话）
+                            for (const item of dirContents) {
+                                const itemPath = path.join(localPath, item);
+                                if (item !== '.git') {
+                                    await fs.promises.rm(itemPath, { recursive: true, force: true });
+                                }
                            }
                        }
                    }
+                    console.log(`🚀 开始克隆: ${url} -> ${localPath}, 分支: ${branch}`);
                    // 克隆仓库
                    await isomorphic_git_1.default.clone({
                        fs: fs,
@@ -401,17 +412,31 @@ class ConfigPanel {
                        depth: 1,
                        ref: branch || 'main',
                        onProgress: (event) => {
+                            console.log(`📊 克隆进度: ${event.phase} - ${event.loaded}/${event.total}`);
                            if (event.total) {
                                const percent = (event.loaded / event.total) * 100;
-                                progress.report({ increment: percent, message: `${event.phase}...` });
+                                progress.report({
+                                    increment: percent,
+                                    message: `${event.phase}... (${Math.round(percent)}%)`
+                                });
+                            }
+                            else {
+                                progress.report({ message: `${event.phase}...` });
                            }
                        }
                    });
                    console.log('✅ Git克隆成功完成');
+                    // 验证克隆是否真的成功
+                    const clonedContents = await fs.promises.readdir(localPath);
+                    console.log(`📁 克隆后的目录内容:`, clonedContents);
+                    if (clonedContents.length === 0) {
+                        throw new Error('克隆后目录为空，可能克隆失败');
+                    }
+                    // 只有在克隆成功后才添加到列表
                    this.moduleFolders.push(newFolder);
                    await this.saveCurrentProjectData();
                    console.log('✅ Git模块文件夹数据已保存到项目文件');
-                    vscode.window.showInformationMessage(`Git 仓库克隆成功: ${name}`);
+                    vscode.window.showInformationMessage(`Git 仓库克隆成功: ${displayName}`);
                    // 检查 Webview 状态后再加载文件树
                    if (!this.isWebviewDisposed) {
                        console.log('🌳 开始加载模块文件夹文件树...');
@@ -426,7 +451,19 @@ class ConfigPanel {
                }
                catch (error) {
                    console.error('❌ 在克隆过程中捕获错误:', error);
+                    // 清理：如果克隆失败，删除可能创建的不完整目录
+                    try {
+                        if (fs.existsSync(localPath)) {
+                            await fs.promises.rm(localPath, { recursive: true, force: true });
+                            console.log('🧹 已清理克隆失败的目录');
+                        }
+                    }
+                    catch (cleanupError) {
+                        console.error('清理失败目录时出错:', cleanupError);
+                    }
                    vscode.window.showErrorMessage(`克隆仓库失败: ${error}`);
+                    // 重新抛出错误，让外部知道克隆失败
+                    throw error;
                }
            });
        }
@@ -1191,9 +1228,19 @@ class ConfigPanel {
        });
        return root;
    }
+    generateModuleFolderName(url, branch) {
+        const repoName = url.split('/').pop()?.replace('.git', '') || 'unknown-repo';
+        const branchSafeName = branch.replace(/[^a-zA-Z0-9-_]/g, '-');
+        return {
+            displayName: repoName,
+            folderName: branchSafeName // 实际文件夹名称（只显示分支名）
+        };
+    }
    async cloneBranches(url, branches) {
        try {
            console.log('🚀 开始克隆分支:', { url, branches });
+            let successCount = 0;
+            let failCount = 0;
            // 显示总进度
            await vscode.window.withProgress({
                location: vscode.ProgressLocation.Notification,
@@ -1207,22 +1254,33 @@ class ConfigPanel {
                        increment: progressPercent,
                        message: `克隆分支: ${branch} (${i + 1}/${branches.length})`
                    });
-                    console.log(`📥 克隆分支: ${branch}`);
-                    await this.addGitModuleFolder(url, this.generateModuleFolderName(url, branch), branch);
+                    console.log(`📥 开始克隆分支: ${branch}`);
+                    try {
+                        const folderNames = this.generateModuleFolderName(url, branch);
+                        await this.addGitModuleFolder(url, folderNames.displayName, folderNames.folderName, branch);
+                        successCount++;
+                        console.log(`✅ 分支克隆成功: ${branch}`);
+                    }
+                    catch (error) {
+                        failCount++;
+                        console.error(`❌ 分支克隆失败: ${branch}`, error);
+                        // 继续克隆其他分支，不中断整个流程
+                    }
                }
            });
-            vscode.window.showInformationMessage(`成功克隆 ${branches.length} 个分支`);
+            // 显示最终结果
+            if (failCount === 0) {
+                vscode.window.showInformationMessage(`成功克隆 ${successCount} 个分支`);
+            }
+            else {
+                vscode.window.showWarningMessage(`克隆完成: ${successCount} 个成功, ${failCount} 个失败`);
+            }
        }
        catch (error) {
            console.error('❌ 克隆分支失败:', error);
            vscode.window.showErrorMessage(`克隆分支失败: ${error}`);
        }
    }
-    generateModuleFolderName(url, branch) {
-        const repoName = url.split('/').pop()?.replace('.git', '') || 'unknown-repo';
-        const branchSafeName = branch.replace(/[^a-zA-Z0-9-_]/g, '-');
-        return `${repoName}-${branchSafeName}`;
-    }
    // 更新视图
    updateWebview() {
        // 检查 Webview 是否仍然有效
@@ -1408,9 +1466,9 @@ class ConfigPanel {
            const relativePath = `/${aircraft.projectId}/${aircraft.name}/${container.name}/${folderName}`;
            // 创建合并文件夹记录
            const newFolder = {
-                id: 'merged-' + Date.now(),
+                id: 'local-' + Date.now(),
                name: displayName,
-                type: 'merged',
+                type: 'local',
                localPath: relativePath,
                containerId: this.currentContainerId
            };
--- a/out/panels/ConfigPanel.js.map
+++ b/out/panels/ConfigPanel.js.map
--- a/out/panels/views/ConfigView.js
+++ b/out/panels/views/ConfigView.js
@@ -19,6 +19,7 @@ class ConfigView extends BaseView_1.BaseView {
                    <input type="checkbox" class="config-checkbox" data-id="${config.id}" data-type="config">
                    <span class="editable" onclick="editConfigName('${config.id}', '${config.name}')">🔧 ${config.name}</span>
                </td>
+                <td>local</td>
                <td>
                    <span class="clickable" onclick="openConfigFileInVSCode('${config.id}')">📄 ${config.fileName}</span>
                </td>
@@ -27,14 +28,17 @@ class ConfigView extends BaseView_1.BaseView {
                </td>
            </tr>
        `).join('');
-        // 生成模块文件夹的 HTML - 统一显示 Git 和合并文件夹
+        // 生成模块文件夹的 HTML - 按类别分类显示
        const moduleFoldersHtml = moduleFolders.map((folder) => {
            const icon = folder.type === 'git' ? '📁' : '📁';
+            // 根据类型确定类别显示
+            const category = folder.type === 'git' ? 'git' : 'local';
            return `
            <tr>
                <td>
                    <span class="editable">${icon} ${folder.name}</span>
                </td>
+                <td>${category}</td>
                <td>
                    <span class="clickable" onclick="openTheModuleFolder('${folder.id}', '${folder.type}')">${folder.localPath.split('/').pop()}</span>
                </td>
@@ -224,6 +228,17 @@ class ConfigView extends BaseView_1.BaseView {
            font-size: 12px;
            color: var(--vscode-descriptionForeground);
        }
+
+        /* 类别标签样式 */
+        .category-git {
+            color: var(--vscode-gitDecoration-untrackedResourceForeground);
+            font-weight: bold;
+        }
+        
+        .category-local {
+            color: var(--vscode-charts-orange);
+            font-weight: bold;
+        }
    </style>
 </head>
 <body>
@@ -245,9 +260,10 @@ class ConfigView extends BaseView_1.BaseView {
        <table class="table">
            <thead>
                <tr>
-                    <th width="30%">配置</th>
-                    <th width="40%">文件/文件夹</th>
-                    <th width="30%">操作</th>
+                    <th width="25%">配置</th>
+                    <th width="15%">类别</th>
+                    <th width="35%">文件/文件夹</th>
+                    <th width="25%">操作</th>
                </tr>
            </thead>
            <tbody>
--- a/out/panels/views/ConfigView.js.map
+++ b/out/panels/views/ConfigView.js.map