fixed expected image path

cenfun · Aug 25, 2024 · d9bb6d4 · d9bb6d4
1 parent 74a8f89
commit d9bb6d4
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 24 deletions.
diff --git a/lib/merge-data.js b/lib/merge-data.js
@@ -61,10 +61,13 @@ const copyTarget = (targetPath, fromDir, toDir) => {
     const oldPath = path.resolve(fromDir, targetPath);
     if (fs.existsSync(oldPath)) {
         const newPath = path.resolve(toDir, targetPath);
-        fs.cpSync(oldPath, newPath, {
-            force: true,
-            recursive: true
-        });
+        if (oldPath !== newPath) {
+            fs.cpSync(oldPath, newPath, {
+                force: true,
+                recursive: true
+            });
+            return true;
+        }
     }
 };
 
@@ -83,7 +86,10 @@ const attachmentsHandler = (item, outputDir, attachmentPathHandler) => {
             }
 
             // copy attachment
-            copyTarget(attachment.path, jsonDir, outputDir);
+            const done = copyTarget(attachment.path, jsonDir, outputDir);
+            if (!done) {
+                Util.logError(`failed to copy: ${attachment.path}`);
+            }
 
             if (attachmentPathHandler) {
                 const newPath = attachmentPathHandler(attachment.path, extras);

diff --git a/lib/visitor.js b/lib/visitor.js
@@ -511,6 +511,9 @@ class Visitor {
                 return;
             }
 
+            // fixed expected image path
+            this.expectedAttachmentHandler(item, attachments);
+
             if (item.body) {
                 if (!item.path) {
                     this.saveAttachmentBodyHandler(item, i, caseId);
@@ -555,6 +558,51 @@ class Visitor {
         }
     }
 
+    getImageCategory(item) {
+        if (item.contentType && item.contentType.startsWith('image/')) {
+            if (item.name) {
+                const match = item.name.match(/^(.*)-(expected|actual|diff)(\.[^.]+)?$/);
+                if (match) {
+                    // , name, category, extension
+                    return match[2];
+                }
+            }
+        }
+    }
+
+    expectedAttachmentHandler(item, attachments) {
+        const category = this.getImageCategory(item);
+        if (category !== 'expected') {
+            return;
+        }
+
+        const actualItem = attachments.find((it) => {
+            if (it.retry !== item.retry) {
+                return false;
+            }
+            const c = this.getImageCategory(it);
+            if (c === 'actual') {
+                return true;
+            }
+            return false;
+        });
+        if (!actualItem) {
+            return;
+        }
+
+        // console.log(item, actualItem);
+
+        const itemDir = path.dirname(actualItem.path);
+        const itemPath = path.resolve(itemDir, item.name);
+
+        if (fs.existsSync(itemPath)) {
+            item.path = itemPath;
+        }
+
+        // no need copy the expected file, it exists
+
+    }
+
     reportHandler(item, itemName, title) {
 
         const definition = Util.attachments[itemName];

diff --git a/packages/app/src/modules/attachments.js b/packages/app/src/modules/attachments.js
@@ -64,24 +64,6 @@ const initGroupList = (group) => {
         return ai - bi;
     });
 
-    let filePath;
-    group.data.list.forEach((it) => {
-        const {
-            category, name, path
-        } = it;
-
-        // fixed expected image path
-        if (category === 'expected' && filePath) {
-            const ls = filePath.split('/');
-            ls.pop();
-            ls.push(name);
-            it.path = ls.join('/');
-        } else {
-            filePath = path;
-        }
-
-    });
-
 };
 
 const existsGroupItem = (group, groupName, retry) => {
@@ -112,7 +94,7 @@ export const groupAttachments = (attachments) => {
     const list = [];
     let group;
     attachments.forEach((attachment) => {
-        const match = attachment.name.match(/^(.*)-(expected|actual|diff|previous)(\.[^.]+)?$/);
+        const match = attachment.name.match(/^(.*)-(expected|actual|diff)(\.[^.]+)?$/);
         if (match) {
             const [, name, category, extension = ''] = match;