nested attachments

Author: Al Manning

src/publish/confluence/confluence-helper.ts

@@ -596,3 +596,31 @@ export const findAttachments = (
 
   return uniqueResult ?? [];
 };
+
+export const getAttachmentsDirectory = (
+  baseDirectory: string,
+  fileName: string = "",
+  attachmentsToUpload: string[] = []
+): string => {
+  if (attachmentsToUpload.length === 0 || fileName.length === 0) {
+    return "";
+  }
+
+  let result = baseDirectory;
+
+  if (result.endsWith("/_site")) {
+    result = result.slice(0, -6);
+  }
+
+  const filePathList = fileName.split("/");
+
+  if (filePathList.length > 1) {
+    const directoryPath = filePathList
+      .slice(0, filePathList.length - 1)
+      .join("/");
+
+    result = `${result}/${directoryPath}`;
+  }
+
+  return result;
+};

src/publish/confluence/confluence.ts

@@ -53,6 +53,7 @@ import {
   doWithSpinner,
   filterFilesForUpdate,
   findAttachments,
+  getAttachmentsDirectory,
   getNextVersion,
   getTitle,
   isContentCreate,
@@ -336,7 +337,8 @@ async function publish(
     publishFiles: PublishFiles,
     id: string,
     body: ContentBody,
-    titleParam: string = title
+    titleParam: string = title,
+    fileName: string = ""
   ): Promise<Content> => {
     const previousPage = await client.getContent(id);
 
@@ -364,15 +366,22 @@ async function publish(
     if (toUpdate.id) {
       const existingAttachments: AttachmentSummary[] =
         await client.getAttachments(toUpdate.id);
+
+      const baseDirectory = getAttachmentsDirectory(
+        publishFiles.baseDir,
+        fileName,
+        attachmentsToUpload
+      );
+
       trace(
         "attachments",
-        { existingAttachments, attachmentsToUpload },
+        { existingAttachments, attachmentsToUpload, baseDirectory },
         LogPrefix.ATTACHMENT
       );
 
       const uploadAttachmentsResult = await Promise.all(
         uploadAttachments(
-          publishFiles.baseDir,
+          baseDirectory,
           attachmentsToUpload,
           toUpdate.id,
           existingAttachments
@@ -661,7 +670,8 @@ async function publish(
           publishFiles,
           update.id ?? "",
           update.body,
-          update.title ?? ""
+          update.title ?? "",
+          update.fileName ?? ""
         );
       } else if (isContentDelete(change)) {
         if (DELETE_DISABLED) {

tests/unit/confluence.test.ts

@@ -16,6 +16,7 @@ import {
   filterFilesForUpdate,
   findAttachments,
   findPagesToDelete,
+  getAttachmentsDirectory,
   getMessageFromAPIError,
   getNextVersion,
   getTitle,
@@ -2907,6 +2908,75 @@ const runFindAttachments = () => {
   });
 };
 
+const runGetAttachmentsDirectory = () => {
+  const suiteLabel = (label: string) => `GetAttachmentsDirectory_${label}`;
+
+  const check = (
+    expected: string,
+    baseDirectory: string,
+    attachmentsToUpload: string[],
+    fileName: string
+  ) => {
+    assertEquals(
+      getAttachmentsDirectory(baseDirectory, fileName, attachmentsToUpload),
+      expected
+    );
+  };
+
+  unitTest(suiteLabel("empty_to_upload"), async () => {
+    const expected = "";
+    const baseDirectory = "/Users/fake-base";
+    check(expected, baseDirectory, [], "file-name.png");
+  });
+
+  unitTest(suiteLabel("empty_fileName"), async () => {
+    const expected = "";
+    const attachmentsToUpload = ["file1.png", "file2.png"];
+    const baseDirectory = "/Users/fake-base";
+    check(expected, baseDirectory, attachmentsToUpload, "");
+  });
+
+  unitTest(suiteLabel("simple"), async () => {
+    const expected = "/Users/fake-base";
+
+    const baseDirectory = "/Users/fake-base";
+    const attachmentsToUpload = ["file1.png"];
+    const fileName = "fake-file.xml";
+
+    check(expected, baseDirectory, attachmentsToUpload, fileName);
+  });
+
+  unitTest(suiteLabel("site_in_root"), async () => {
+    const expected = "/Users/fake-base";
+
+    const baseDirectory = "/Users/fake-base/_site";
+    const attachmentsToUpload = ["file1.png"];
+    const fileName = "fake-file.xml";
+
+    check(expected, baseDirectory, attachmentsToUpload, fileName);
+  });
+
+  unitTest(suiteLabel("site_nested"), async () => {
+    const expected = "/Users/fake-base/fake-parent";
+
+    const baseDirectory = "/Users/fake-base/_site";
+    const attachmentsToUpload = ["file1.png"];
+    const fileName = "fake-parent/fake-file.xml";
+
+    check(expected, baseDirectory, attachmentsToUpload, fileName);
+  });
+
+  unitTest(suiteLabel("site_nested_multi"), async () => {
+    const expected = "/Users/fake-base/fake-grand-parent/fake-parent";
+
+    const baseDirectory = "/Users/fake-base/_site";
+    const attachmentsToUpload = ["file1.png"];
+    const fileName = "fake-grand-parent/fake-parent/fake-file.xml";
+
+    check(expected, baseDirectory, attachmentsToUpload, fileName);
+  });
+};
+
 const runUpdateImagePathsForContentBody = () => {
   const suiteLabel = (label: string) =>
     `UpdateImagePathsForContentBody_${label}`;
@@ -2974,9 +3044,8 @@ if (runAllTests) {
   runExtractLinks();
   runUpdateLinks();
   runFindAttachments();
+  runGetAttachmentsDirectory();
   runUpdateImagePathsForContentBody();
 } else {
-  // runSpaceCreatesWithNesting();
-  // runSpaceUpdatesWithNesting();
-  runSpaceUpdatesWithNestedMoves();
+  runGetAttachmentsDirectory();
 }