Bug: Attachments with ./ relative to the current directly aren't working

Author: Al Manning

src/publish/confluence/confluence-helper.ts

@@ -636,18 +636,19 @@ 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) {
     return "";
   }
 
   const filePathList = filePath.split("/");
-  const attachmentPathList = attachmentPath.split("/");
+  let attachmentPathList = attachmentPath.split("/");
+
+  //TODO navigate path with '..'
+  if (attachmentPathList.length === 2 && attachmentPathList[0] === ".") {
+    attachmentPathList = attachmentPathList.slice(1);
+  }
 
   const pathNoFileFromList = (pathList: string[]) =>
     pathList.slice(0, pathList.length - 1).join("/");
@@ -661,7 +662,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,8 +296,6 @@ async function publish(
         attachmentPath
       );
 
-      console.log("uploadDirectory", uploadDirectory);
-
       trace(
         "uploadAttachment",
         {
@@ -358,20 +356,12 @@ 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,
       fileName
     );
 
-    console.log("attachmentsToUpload", attachmentsToUpload);
-
     //FIXME expected elephant.png
 
     const uniqueTitle = await uniquifyTitle(titleToUpdate, id);
@@ -405,8 +395,6 @@ async function publish(
         LogPrefix.ATTACHMENT
       );
 
-      console.log("attachmentsToUpload", attachmentsToUpload);
-
       const uploadAttachmentsResult = await Promise.all(
         uploadAttachments(
           publishFiles.baseDir,

tests/unit/confluence.test.ts

@@ -3131,6 +3131,16 @@ const runGetAttachmentsDirectory = () => {
     check(expected, baseDirectory, attachmentPath, fileName);
   });
 
+  otest(suiteLabel("site_nested_relative_dotslash"), async () => {
+    const expected = "/Users/fake-base/fake-parent";
+
+    const baseDirectory = "/Users/fake-base/_site";
+    const attachmentPath = "./file1.png";
+    const fileName = "fake-parent/fake-file.xml";
+
+    check(expected, baseDirectory, attachmentPath, fileName);
+  });
+
   test(suiteLabel("site_nested_absolute"), async () => {
     const expected = "/Users/fake-base";
 
@@ -3150,12 +3160,6 @@ const runGetAttachmentsDirectory = () => {
 
     check(expected, baseDirectory, attachmentPath, fileName);
   });
-
-  //TODO test
-  // [
-  //   "images/elephant.png",
-  //   "parent/inner-parent/elephant.png",
-  // ];
 };
 
 const runUpdateImagePathsForContentBody = () => {
@@ -3226,5 +3230,5 @@ if (RUN_ALL_TESTS) {
   runGetAttachmentsDirectory();
   runUpdateImagePathsForContentBody();
 } else {
-  runFindAttachments();
+  runGetAttachmentsDirectory();
 }