fix gen file issues

src/function/treeView/command.ts

@@ -245,18 +245,27 @@ export async function clean() {
     const plName = opeParam.prjInfo.prjName.PL;
     const targetPath = fspath.dirname(opeParam.prjInfo.arch.hardware.src);
 
-    let type = 'srcs';
     if (hdlDir.isDir(`${workspacePath}/prj/xilinx/${plName}.gen`)) {
-        type = 'gen';
+        const sourceIpPath = `${workspacePath}/prj/xilinx/${plName}.gen/sources_1/ip`;
-    }
+        const sourceBdPath = `${workspacePath}/prj/xilinx/${plName}.gen/sources_1/bd`;
-    const sourceIpPath = `${workspacePath}/prj/xilinx/${plName}.${type}/sources_1/ip`;
-    const sourceBdPath = `${workspacePath}/prj/xilinx/${plName}.${type}/sources_1/bd`;
 
         hdlDir.mvdir(sourceIpPath, targetPath, true);
         MainOutput.report("move dir from " + sourceIpPath + " to " + targetPath);
 
         hdlDir.mvdir(sourceBdPath, targetPath, true);
         MainOutput.report("move dir from " + sourceBdPath + " to " + targetPath);
+    }
+
+    if (hdlDir.isDir(`${workspacePath}/prj/xilinx/${plName}.srcs`)) {
+        const sourceIpPath = `${workspacePath}/prj/xilinx/${plName}.srcs/sources_1/ip`;
+        const sourceBdPath = `${workspacePath}/prj/xilinx/${plName}.srcs/sources_1/bd`;
+
+        hdlDir.mvdir(sourceIpPath, targetPath, true);
+        MainOutput.report("move dir from " + sourceIpPath + " to " + targetPath);
+
+        hdlDir.mvdir(sourceBdPath, targetPath, true);
+        MainOutput.report("move dir from " + sourceBdPath + " to " + targetPath);
+    }
             
     if (prjPath !== opeParam.workspacePath) {
         hdlDir.rmdir(prjPath);

src/manager/PL/xilinx.ts

@@ -286,19 +286,27 @@ class XilinxOperation {
         const plName = opeParam.prjInfo.prjName.PL;
         const targetPath = fspath.dirname(opeParam.prjInfo.arch.hardware.src);
 
-        let type = 'srcs';
         if (hdlDir.isDir(`${workspacePath}/prj/xilinx/${plName}.gen`)) {            
-            type = 'gen'
+            const sourceIpPath = `${workspacePath}/prj/xilinx/${plName}.gen/sources_1/ip`;
-        }
+            const sourceBdPath = `${workspacePath}/prj/xilinx/${plName}.gen/sources_1/bd`;
-
-        const sourceIpPath = `${workspacePath}/prj/xilinx/${plName}.${type}/sources_1/ip`;
-        const sourceBdPath = `${workspacePath}/prj/xilinx/${plName}.${type}/sources_1/bd`;
     
             hdlDir.mvdir(sourceIpPath, targetPath, true);
             HardwareOutput.report("move dir from " + sourceIpPath + " to " + targetPath);
     
             hdlDir.mvdir(sourceBdPath, targetPath, true);
             HardwareOutput.report("move dir from " + sourceBdPath + " to " + targetPath);
+        }
+
+        if (hdlDir.isDir(`${workspacePath}/prj/xilinx/${plName}.srcs`)) {            
+            const sourceIpPath = `${workspacePath}/prj/xilinx/${plName}.srcs/sources_1/ip`;
+            const sourceBdPath = `${workspacePath}/prj/xilinx/${plName}.srcs/sources_1/bd`;
+    
+            hdlDir.mvdir(sourceIpPath, targetPath, true);
+            HardwareOutput.report("move dir from " + sourceIpPath + " to " + targetPath);
+    
+            hdlDir.mvdir(sourceBdPath, targetPath, true);
+            HardwareOutput.report("move dir from " + sourceBdPath + " to " + targetPath);
+        }
 
         await this.closeAllWindows();
     }

src/manager/prj.ts

@@ -398,14 +398,11 @@ class PrjManage {
             workspace: string,
             plname: string
         ) {
-            let standardIpPath = hdlPath.join(workspace, 'user', 'ip');
+            const standardIpPath = hdlPath.join(workspace, 'user', 'ip');
-            let xilinxSrcsPath = hdlPath.join(workspace, plname + '.gen');
+            
-            if (!fs.existsSync(xilinxSrcsPath)) {
+            if (hdlDir.isDir(hdlPath.join(workspace, plname + '.gen'))) {                
-                xilinxSrcsPath = hdlPath.join(workspace, plname + '.srcs');
+                const xilinxSrcsPath = hdlPath.join(workspace, plname + '.gen');
-                if (!fs.existsSync(xilinxSrcsPath)) {
+    
-                    return;
-                }
-            }
                 const sourceNames = fs.readdirSync(xilinxSrcsPath).filter(filename => filename.startsWith(matchPrefix));
                 for (const sn of sourceNames) {
                     const ipPath = hdlPath.join(xilinxSrcsPath, sn, 'ip');
@@ -422,6 +419,26 @@ class PrjManage {
                 }
             }
 
+            if (hdlDir.isDir(hdlPath.join(workspace, plname + '.srcs'))) {                
+                const xilinxSrcsPath = hdlPath.join(workspace, plname + '.srcs');
+    
+                const sourceNames = fs.readdirSync(xilinxSrcsPath).filter(filename => filename.startsWith(matchPrefix));
+                for (const sn of sourceNames) {
+                    const ipPath = hdlPath.join(xilinxSrcsPath, sn, 'ip');
+    
+                    if (!hdlFile.isDir(ipPath)) {
+                        continue;
+                    }
+    
+                    for (const ipname of fs.readdirSync(ipPath)) {
+                        const sourcePath = hdlPath.join(ipPath, ipname);
+                        hdlDir.mvdir(sourcePath, standardIpPath, true);
+                    }
+                    hdlDir.rmdir(ipPath);
+                }
+            }
+        }
+
         /**
          * @description 将文件从 Xilinx 中迁移到标准结构去
          * 根据 ${workspace}/${plname}.srcs 下以 source_ 开头的前缀分两种情况：