nested attachment uploads

Author: Al Manning

src/publish/confluence/confluence-helper.ts

@@ -599,26 +599,33 @@ export const findAttachments = (
 
 export const getAttachmentsDirectory = (
   baseDirectory: string,
-  fileName: string = "",
-  attachmentsToUpload: string[] = []
+  filePath: string = "",
+  attachmentPath: string = ""
 ): string => {
-  if (attachmentsToUpload.length === 0 || fileName.length === 0) {
+  let result = baseDirectory;
+
+  if (attachmentPath.length === 0 || filePath.length === 0) {
     return "";
   }
 
-  let result = baseDirectory;
+  const filePathList = filePath.split("/");
+  const attachmentPathList = attachmentPath.split("/");
+
+  const pathNoFileFromList = (pathList: string[]) =>
+    pathList.slice(0, pathList.length - 1).join("/");
+
+  if (attachmentPathList.some((path) => path.endsWith("_files"))) {
+    return 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("/");
+  const isRelative = attachmentPathList.length === 1;
 
+  if (isRelative && filePathList.length > 1) {
+    const directoryPath = pathNoFileFromList(filePathList);
     result = `${result}/${directoryPath}`;
   }
 

src/publish/confluence/confluence.ts

@@ -281,21 +281,34 @@ async function publish(
 
   const uploadAttachments = (
     baseDirectory: string,
-    pathList: string[],
+    attachmentsToUpload: string[],
     parentId: string,
+    filePath: string,
     existingAttachments: AttachmentSummary[] = []
   ): Promise<AttachmentSummary | null>[] => {
     const uploadAttachment = async (
-      pathToUpload: string
+      attachmentPath: string
     ): Promise<AttachmentSummary | null> => {
+      const uploadDirectory = getAttachmentsDirectory(
+        baseDirectory,
+        filePath,
+        attachmentPath
+      );
+
       trace(
         "uploadAttachment",
-        { baseDirectory, pathList, parentId, existingAttachments },
+        {
+          baseDirectory,
+          pathList: attachmentsToUpload,
+          parentId,
+          existingAttachments,
+        },
         LogPrefix.ATTACHMENT
       );
       let fileBuffer: Uint8Array;
       let fileHash: string;
-      const path = join(baseDirectory, pathToUpload);
+      const path = join(uploadDirectory, attachmentPath);
+
       try {
         fileBuffer = await Deno.readFile(path);
         fileHash = md5Hash(fileBuffer.toString());
@@ -304,7 +317,7 @@ async function publish(
         return null;
       }
 
-      const fileName = pathToUpload;
+      const fileName = attachmentPath;
 
       const existingDuplicateAttachment = existingAttachments.find(
         (attachment: AttachmentSummary) => {
@@ -330,7 +343,7 @@ async function publish(
       return attachment;
     };
 
-    return pathList.map(uploadAttachment);
+    return attachmentsToUpload.map(uploadAttachment);
   };
 
   const updateContent = async (
@@ -342,7 +355,10 @@ async function publish(
   ): Promise<Content> => {
     const previousPage = await client.getContent(id);
 
-    const attachmentsToUpload: string[] = findAttachments(body.storage.value);
+    const attachmentsToUpload: string[] = findAttachments(
+      body.storage.value,
+      publishFiles.files
+    );
 
     trace("attachmentsToUpload", attachmentsToUpload, LogPrefix.ATTACHMENT);
 
@@ -367,23 +383,18 @@ async function publish(
       const existingAttachments: AttachmentSummary[] =
         await client.getAttachments(toUpdate.id);
 
-      const baseDirectory = getAttachmentsDirectory(
-        publishFiles.baseDir,
-        fileName,
-        attachmentsToUpload
-      );
-
       trace(
         "attachments",
-        { existingAttachments, attachmentsToUpload, baseDirectory },
+        { existingAttachments, attachmentsToUpload },
         LogPrefix.ATTACHMENT
       );
 
       const uploadAttachmentsResult = await Promise.all(
         uploadAttachments(
-          baseDirectory,
+          publishFiles.baseDir,
           attachmentsToUpload,
           toUpdate.id,
+          fileName,
           existingAttachments
         )
       );
@@ -474,8 +485,6 @@ async function publish(
     createParent: ConfluenceParent = parent,
     fileName: string = ""
   ): Promise<Content> => {
-    //TODO check why files are always being uniquified
-
     const createTitle = await uniquifyTitle(titleToCreate);
 
     const attachmentsToUpload: string[] = findAttachments(
@@ -505,7 +514,8 @@ async function publish(
         uploadAttachments(
           publishFiles.baseDir,
           attachmentsToUpload,
-          createdContent.id
+          createdContent.id,
+          fileName
         )
       );
       trace(

src/publish/confluence/constants.ts

@@ -12,4 +12,4 @@ export const V2EDITOR_METADATA = {
   },
 };
 
-export const DELETE_SLEEP_MILLIS = 5000; //TODO replace with polling
+export const DELETE_SLEEP_MILLIS = 1000; //TODO replace with polling