fix: images with Metadata (#130)

* Fix Bug

* Fix

* Add escaped metadata for use in tables

* Metadata is now linked to GFM

* Disable Metdata if convertWikiLinksToMarkdown is true.

Author: fabsch225

src/config.ts

@@ -1,5 +1,5 @@
 export const ATTACHMENT_URL_REGEXP =
-    /!\[\[((.*?)\.(\w+))(?:\s*\|\s*(?<width>\d+%?)\s*(?:[*|x]\s*(?<height>\d+%?))?)?\]\]/g;
+    /!\[\[((.*?)\.(\w+))(?:\s*(?<metadata>(?:\|(?<width>\d+%?)(?:[*|x](?<height>\d+%?))?|\\\|(?<escapedWidth>\d+%?)(?:[*|x](?<escapedHeight>\d+%?))?|\|[^\]]*|\\\|[^\]]*|#[^\]]*)))?\]\]/g;
 
 export const MARKDOWN_ATTACHMENT_URL_REGEXP = /!\[(.*?)\]\(((.*?)\.(\w+))\)/g;
 

src/utils.ts

@@ -22,12 +22,30 @@ type CopyMarkdownOptions = {
     outputSubPath: string;
 };
 
+type ImageLink = {
+    rawImageLink: string;
+    imageLink: string;
+    metadata: string;
+    width?: string;
+    height?: string;
+};
+
 export async function getImageLinks(markdown: string) {
     const imageLinks = markdown.matchAll(ATTACHMENT_URL_REGEXP);
     const markdownImageLinks = markdown.matchAll(
         MARKDOWN_ATTACHMENT_URL_REGEXP
     );
-    return Array.from(imageLinks).concat(Array.from(markdownImageLinks));
+    return Array.from(imageLinks)
+        .concat(Array.from(markdownImageLinks))
+        .map((match): ImageLink => ({
+            rawImageLink: match[0],
+            imageLink: match[0].startsWith("![[") ? match[1] : match[2],
+            metadata: match[0].startsWith("![[")
+                ? match.groups?.metadata || ""
+                : "",
+            width: match.groups?.width || match.groups?.escapedWidth,
+            height: match.groups?.height || match.groups?.escapedHeight,
+        }));
 }
 
 export async function getEmbeds(markdown: string) {
@@ -340,8 +358,7 @@ export async function tryCopyImage(
                 const fileNameWithoutExt = filename.replace(/\.[^/.]+$/, "");
 
                 for (const index in imageLinks) {
-                    const urlEncodedImageLink =
-                        imageLinks[index][7 - imageLinks[index].length];
+                    const urlEncodedImageLink = imageLinks[index].imageLink;
 
                     // decode and replace the relative path
                     let imageLink = "";
@@ -361,10 +378,15 @@ export async function tryCopyImage(
                         imageLink,
                         contentPath
                     );
+                    const imageFile =
+                        ifile ||
+                        plugin.app.vault.getAbstractFileByPath(
+                            path.join(path.dirname(contentPath), imageLink)
+                        );
 
                     const filePath =
-                        ifile !== null
-                            ? ifile.path
+                        imageFile !== null
+                            ? imageFile.path
                             : path.join(path.dirname(contentPath), imageLink);
 
                     // filter markdown link eg: http://xxx.png
@@ -408,7 +430,7 @@ export async function tryCopyImage(
                             ) {
                                 const resourceOsPath = getResourceOsPath(
                                     plugin,
-                                    ifile
+                                    imageFile instanceof TFile ? imageFile : null
                                 );
                                 fs.copyFileSync(resourceOsPath, targetPath);
                             } else {
@@ -851,10 +873,11 @@ export async function tryCopyMarkdownByRead(
             }
 
             for (const index in imageLinks) {
-                const rawImageLink = imageLinks[index][0];
-
-                const urlEncodedImageLink =
-                    imageLinks[index][7 - imageLinks[index].length];
+                const rawImageLink = imageLinks[index].rawImageLink;
+                const urlEncodedImageLink = imageLinks[index].imageLink;
+                const imageMetadata = plugin.settings.GFM
+                    ? ""
+                    : imageLinks[index].metadata;
 
                 // decode and replace the relative path
                 let imageLink = "";
@@ -899,8 +922,7 @@ export async function tryCopyMarkdownByRead(
                 }
 
                 if (plugin.settings.displayImageAsHtml) {
-                    const { width = null, height = null } =
-                        imageLinks[index]?.groups || {};
+                    const { width = null, height = null } = imageLinks[index];
                     // Helper to format size value - append 'px' only if not a percentage
                     const formatSize = (value: string | null) => {
                         if (!value) return "";
@@ -919,13 +941,26 @@ export async function tryCopyMarkdownByRead(
                         rawImageLink,
                         `<img src="${hashLink}"${style} />`
                     );
-                } else if (plugin.settings.GFM) {
+                } else if (
+                    plugin.settings.convertWikiLinksToMarkdown &&
+                    rawImageLink.startsWith("![[")
+                ) {
                     content = content.replace(
                         rawImageLink,
                         GFM_IMAGE_FORMAT.format(hashLink)
                     );
+                } else if (plugin.settings.GFM) {
+                    content = content.replace(
+                        rawImageLink,
+                        GFM_IMAGE_FORMAT.format(hashLink + imageMetadata)
+                    );
                 } else {
-                    content = content.replace(urlEncodedImageLink, hashLink);
+                    content = content.replace(
+                        rawImageLink,
+                        rawImageLink.startsWith("![[")
+                            ? `![[${hashLink}${imageMetadata}]]`
+                            : rawImageLink.replace(urlEncodedImageLink, hashLink)
+                    );
                 }
             }