Merge pull request #4030 from quarto-dev/bug/find-attachment-windows

universal file path metadata in pages

Author: Allen Manning

src/publish/confluence/api/index.ts

@@ -128,8 +128,6 @@ export class ConfluenceClient {
       WrappedResult<AttachmentSummary>
     >(`content/${id}/child/attachment`);
 
-    trace("getAttachments", wrappedResult, LogPrefix.ATTACHMENT);
-
     const result = wrappedResult?.results ?? [];
     return result;
   }

src/publish/confluence/confluence-helper.ts

@@ -317,11 +317,12 @@ export const buildSpaceChanges = (
         (page: SitePage) => page?.metadata?.fileName === fileName
       );
 
-    const existingPage = findPageInExistingSite(fileMetadata.fileName);
+    const universalFileName = pathWithForwardSlashes(fileMetadata.fileName);
+    const existingPage = findPageInExistingSite(universalFileName);
 
     let spaceChangeList: ConfluenceSpaceChange[] = [];
 
-    const pathList = fileMetadata.fileName.split("/");
+    const pathList = universalFileName.split("/");
 
     let pageParent =
       pathList.length > 1
@@ -335,6 +336,7 @@ export const buildSpaceChanges = (
 
       let existingSiteParent = null;
 
+      //TODO update with deno paths after tests are in place
       const parentsList = pathList.slice(0, pathList.length - 1);
 
       parentsList.forEach((parentFileName, index) => {
@@ -343,6 +345,7 @@ export const buildSpaceChanges = (
         const ancestor = index > 0 ? ancestorFilePath : parent?.parent;
 
         let fileName = `${ancestorFilePath}/${parentFileName}`;
+
         if (fileName.startsWith("/")) {
           fileName = parentFileName;
         }
@@ -407,7 +410,7 @@ export const buildSpaceChanges = (
           existingPage.id,
           useOriginalTitle ? fileMetadata.originalTitle : fileMetadata.title,
           fileMetadata.contentBody,
-          fileMetadata.fileName,
+          universalFileName,
           pageParent
         ),
       ];
@@ -418,7 +421,7 @@ export const buildSpaceChanges = (
           fileMetadata.title,
           space,
           fileMetadata.contentBody,
-          fileMetadata.fileName,
+          universalFileName,
           pageParent,
           ContentStatusEnum.current
         ),

src/publish/confluence/confluence.ts

@@ -3,6 +3,7 @@
 import { join } from "path/mod.ts";
 import { Input, Secret } from "cliffy/prompt/mod.ts";
 import { RenderFlags } from "../../command/render/types.ts";
+import { pathWithForwardSlashes } from "../../core/path.ts";
 
 import {
   readAccessTokens,
@@ -244,7 +245,7 @@ async function publish(
 
   const space = await client.getSpace(parent.space);
 
-  trace("publish", { parent, server, space });
+  trace("publish", { parent, server, id: space.id, key: space.key });
 
   const uniquifyTitle = async (title: string, idToIgnore: string = "") => {
     const titleAlreadyExistsInSpace: boolean = await client.isTitleInSpace(
@@ -483,10 +484,12 @@ async function publish(
     body: ContentBody,
     titleToCreate: string = title,
     createParent: ConfluenceParent = parent,
-    fileName: string = ""
+    fileNameParam: string = ""
   ): Promise<Content> => {
     const createTitle = await uniquifyTitle(titleToCreate);
 
+    const fileName = pathWithForwardSlashes(fileNameParam);
+
     const attachmentsToUpload: string[] = findAttachments(
       body.storage.value,
       publishFiles.files,
@@ -578,10 +581,9 @@ async function publish(
       parentId,
       publishFiles,
       metadataByInput,
+      existingSite,
     });
 
-    trace("existingSite", existingSite);
-
     const filteredFiles: string[] = filterFilesForUpdate(publishFiles.files);
 
     trace("filteredFiles", filteredFiles);
@@ -654,16 +656,18 @@ async function publish(
           parent: ancestorId ?? siteParent.parent,
         };
 
+        const universalPath = pathWithForwardSlashes(change.fileName ?? "");
+
         const result = await createContent(
           publishFiles,
           change.body,
           change.title ?? "",
           ancestorParent,
-          change.fileName
+          universalPath
         );
 
-        if (change.fileName) {
-          pathsToId[change.fileName] = result.id ?? "";
+        if (universalPath) {
+          pathsToId[universalPath] = result.id ?? "";
         }
 
         const contentPropertyResult: Content =