From a5da864aa760bfaa5586aa9560723022820b1de8 Mon Sep 17 00:00:00 2001
From: Alexander Alemayhu <alexander@alemayhu.com>
Date: Sat, 14 Dec 2024 16:03:09 +0100
Subject: [PATCH] fix: use the file contents when creating unique file name

I am hoping this will resolve some bugs where re-importing the same page
is causing the wrong images to show up on the wrong toggles.
---
 src/lib/parser/exporters/embedFile.ts | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/lib/parser/exporters/embedFile.ts b/src/lib/parser/exporters/embedFile.ts
index 8b665167..af411b5c 100644
--- a/src/lib/parser/exporters/embedFile.ts
+++ b/src/lib/parser/exporters/embedFile.ts
@@ -61,22 +61,27 @@ export const embedFile = (input: EmbedFileInput): string | null => {
   const suffix = SuffixFrom(filePath);
   const file = getFile(exporter, files, filePath, workspace);
 
+  /**
+   * The found file can be a file path in the workspace or a file in the zip or url.
+   * The contents is used first to avoid name conflicts. URL can have conflicts but so far
+   * no bug reports.
+   */
   if (file) {
-    const newName = getUniqueFileName(filePath) + suffix;
     const contents = file.contents as string;
+    const newName = getUniqueFileName(contents ?? filePath) + suffix;
     if (contents) {
       exporter.addMedia(newName, contents);
     }
     return newName;
-  } else {
-    console.debug(
-      JSON.stringify({
-        hint: 'Missing relative path',
-        filePath: filePath,
-        fileNames: files.map((f) => f.name),
-      })
-    );
   }
 
+  console.debug(
+    JSON.stringify({
+      hint: 'Missing relative path',
+      filePath: filePath,
+      fileNames: files.map((f) => f.name),
+    })
+  );
+
   return null;
 };