Bug: Same-named attachments not resolving correctly for nested pages.

Author: Al Manning

src/publish/confluence/confluence-helper.ts

@@ -636,6 +636,10 @@ export const getAttachmentsDirectory = (
   filePath: string = "",
   attachmentPath: string = ""
 ): string => {
+  console.log("baseDirectory", baseDirectory);
+  console.log("filePath", filePath);
+  console.log("attachmentPath", attachmentPath);
+
   let result = baseDirectory;
 
   if (attachmentPath.length === 0 || filePath.length === 0) {
@@ -657,7 +661,7 @@ export const getAttachmentsDirectory = (
   }
 
   const isRelative = attachmentPathList.length === 1;
-
+  console.log("isRelative", isRelative);
   if (isRelative && filePathList.length > 1) {
     const directoryPath = pathNoFileFromList(filePathList);
     result = `${result}/${directoryPath}`;

src/publish/confluence/confluence.ts

@@ -296,6 +296,8 @@ async function publish(
         attachmentPath
       );
 
+      console.log("uploadDirectory", uploadDirectory);
+
       trace(
         "uploadAttachment",
         {
@@ -356,11 +358,22 @@ async function publish(
   ): Promise<Content> => {
     const previousPage = await client.getContent(id);
 
+    console.log("updateContent");
+    console.log("titleToUpdate", titleToUpdate);
+    console.log("body.storage.value", body.storage.value);
+    console.log("publishFiles.files", publishFiles.files);
+    console.log("fileName", fileName);
+
     const attachmentsToUpload: string[] = findAttachments(
       body.storage.value,
-      publishFiles.files
+      publishFiles.files,
+      fileName
     );
 
+    console.log("attachmentsToUpload", attachmentsToUpload);
+
+    //FIXME expected elephant.png
+
     const uniqueTitle = await uniquifyTitle(titleToUpdate, id);
 
     trace("attachmentsToUpload", attachmentsToUpload, LogPrefix.ATTACHMENT);
@@ -392,6 +405,8 @@ async function publish(
         LogPrefix.ATTACHMENT
       );
 
+      console.log("attachmentsToUpload", attachmentsToUpload);
+
       const uploadAttachmentsResult = await Promise.all(
         uploadAttachments(
           publishFiles.baseDir,

tests/unit/confluence.test.ts

@@ -2975,6 +2975,18 @@ const runFindAttachments = () => {
     check(expected, bodyValue, filePaths);
   });
 
+  test(suiteLabel("single_image_lookup_relative_path"), async () => {
+    const bodyValue: string =
+      '<ri:attachment ri:filename="elephant.png" ri:version-at-save="1" />';
+    const filePaths: string[] = [
+      "images/elephant.png",
+      "parent/inner-parent/elephant.png",
+    ];
+    const path = "parent/inner-parent/hello-world3.xml";
+    const expected: string[] = ["parent/inner-parent/elephant.png"];
+    check(expected, bodyValue, filePaths, path);
+  });
+
   test(suiteLabel("single_image_lookup_dupe_name"), async () => {
     const bodyValue: string =
       '<ri:attachment ri:filename="elephant.png" ri:version-at-save="1" />';
@@ -3138,6 +3150,12 @@ const runGetAttachmentsDirectory = () => {
 
     check(expected, baseDirectory, attachmentPath, fileName);
   });
+
+  //TODO test
+  // [
+  //   "images/elephant.png",
+  //   "parent/inner-parent/elephant.png",
+  // ];
 };
 
 const runUpdateImagePathsForContentBody = () => {
@@ -3208,5 +3226,5 @@ if (RUN_ALL_TESTS) {
   runGetAttachmentsDirectory();
   runUpdateImagePathsForContentBody();
 } else {
-  runUpdateLinks();
+  runFindAttachments();
 }