From e5b53585aac1dc6af4e0a5a92746df66fe47a33a Mon Sep 17 00:00:00 2001
From: Peaceultime <clem31470@gmail.com>
Date: Fri, 18 Apr 2025 20:10:21 +0200
Subject: [PATCH] Fix pull job and link rewrite

---
 components/prose/ProseA.vue |  6 ++---
 server/tasks/pull.ts        | 46 +++++++++++++++++++------------------
 shared/general.util.ts      |  2 +-
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/components/prose/ProseA.vue b/components/prose/ProseA.vue
index a4e3cf0..0c005c2 100644
--- a/components/prose/ProseA.vue
+++ b/components/prose/ProseA.vue
@@ -2,8 +2,8 @@
 	<NuxtLink class="text-accent-blue inline-flex items-center" :to="overview ? { name: 'explore-path', params: { path: overview.path }, hash: hash } : href" :class="class">
 		<HoverCard nuxt-client class="max-w-[600px] max-h-[600px] w-full overflow-auto z-[45]" :class="{'overflow-hidden !p-0': overview?.type === 'canvas'}" :disabled="!overview">
 			<template #content>
-				<Markdown v-if="overview?.type === 'markdown'" class="!px-6" :path="pathname" :filter="hash.substring(1)" popover />
-				<template v-else-if="overview?.type === 'canvas'"><div class="w-[600px] h-[600px] relative"><Canvas :path="pathname" /></div></template>
+				<Markdown v-if="overview?.type === 'markdown'" class="!px-6" :path="decodeURIComponent(pathname)" :filter="hash.substring(1)" popover />
+				<template v-else-if="overview?.type === 'canvas'"><div class="w-[600px] h-[600px] relative"><Canvas :path="decodeURIComponent(pathname)" /></div></template>
 			</template>
 			<span>
 				<slot v-bind="$attrs"></slot>
@@ -26,7 +26,7 @@ const { href } = defineProps<{
 const { hash, pathname } = parseURL(href);
 
 const { content } = useContent();
-const overview = computed(() => content.value.find(e => e.path === pathname));
+const overview = computed(() => content.value.find(e => e.path === decodeURIComponent(pathname)));
 </script>
 
 <style>
diff --git a/server/tasks/pull.ts b/server/tasks/pull.ts
index 75b5c97..46c7bb3 100644
--- a/server/tasks/pull.ts
+++ b/server/tasks/pull.ts
@@ -4,6 +4,7 @@ import type { FileType } from '~/types/content';
 import type { CanvasColor, CanvasContent } from "~/types/canvas";
 import { explorerContentTable } from "~/db/schema";
 import { convertToStorableLinks } from "../api/file.post";
+import { parsePath } from "~/shared/general.util";
 
 const typeMapping: Record<string, FileType> = {
     ".md": "markdown",
@@ -17,6 +18,7 @@ export default defineTask({
     },
     async run(event) {
         try {
+            //@ts-ignore
             const tree = await $fetch('https://git.peaceultime.com/api/v1/repos/peaceultime/system-aspect/git/trees/master', {
                 method: 'get',
                 headers: {
@@ -33,44 +35,41 @@ export default defineTask({
                 {
                     const title = basename(e.path);
                     const order = /(\d+)\. ?(.+)/gsmi.exec(title);
-                    const path = (e.path as string).split('/').map(f => { const check = /(\d+)\. ?(.+)/gsmi.exec(f); return check && check[2] ? check[2] : f }).join('/');
                     return { 
-                        path: path.toLowerCase().replaceAll(" ", "-").normalize("NFD").replace(/[\u0300-\u036f]/g, ""), 
+                        path: e.path, 
                         order: i,
-                        title: order && order[2] ? order[2] : title,
+                        title: title,
                         type: 'folder',
                         content: null,
-                        owner: '1',
+                        owner: 1,
                         navigable: true,
-                        private: e.path.startsWith('98.Privé'),
+                        private: e.path === '98. Privé',
+                        timestamp: new Date(),
                     }
                 }
 
                 const extension = extname(e.path);
                 const title = basename(e.path, extension);
                 const order = /(\d+)\. ?(.+)/gsmi.exec(title);
-                const path = (e.path as string).split('/').map(f => { const check = /(\d+)\. ?(.+)/gsmi.exec(f); return check && check[2] ? check[2] : f }).join('/');
                 const content = (await $fetch(`https://git.peaceultime.com/api/v1/repos/peaceultime/system-aspect/raw/${encodeURIComponent(e.path)}`));
 
                 return { 
-                    path: (extension === '.md' ? path.replace(extension, '') : path).toLowerCase().replaceAll(" ", "-").normalize("NFD").replace(/[\u0300-\u036f]/g, ""), 
+                    path: extension === '.md' ? e.path.replace(extension, '') : e.path, 
                     order: i,
-                    title: order && order[2] ? order[2] : title,
+                    title: title,
                     type: (typeMapping[extension] ?? 'file'), 
                     content: reshapeContent(content as string, typeMapping[extension] ?? 'File'),
-                    owner: '1',
+                    owner: 1,
                     navigable: true,
-                    private: e.path.startsWith('98.Privé')
+                    private: e.path === '98. Privé',
+                    timestamp: new Date(),
                 }
             }));
-
-            const pathList = files.map(e => e.path);
+            
             files.forEach(e => {
-                if(e.type !== 'folder' && e.content)
-                {
-                    e.content = Buffer.from(convertToStorableLinks(e.content.toString('utf-8'), files.map(e => e.path)), 'utf-8');
-                }
-            })
+                const content = reshapeLinks(e.content as string | null, files) ?? null;
+                e.content = content ? Buffer.from(content, 'utf-8') : null;
+            });
 
             const db = useDatabase();
             db.delete(explorerContentTable).run();
@@ -86,21 +85,24 @@ export default defineTask({
         }
     },
 })
+function reshapeLinks(content: string | null, all: typeof explorerContentTable.$inferInsert[])
+{
+    return content?.replace(/!?\[\[([^\[\]\|\#]+)?(#+[^\[\]\|\#]+)?(\|[^\[\]\|\#]+)?\]\]/g, (str, link, header, title) => {
+        return `[[${link ? all.find(e => e.path.endsWith(link))?.path ?? link : ''}${header ?? ''}${title ?? ''}]]`;
+    });
+}
 
 function reshapeContent(content: string, type: FileType): string | null
 {
     switch(type)
     {
         case "markdown":
-            return content.replaceAll(/!?\[\[([^\[\]\|\#]+)?(#+[^\[\]\|\#]+)?(\|[^\[\]\|\#]+)?\]\]/g, (e: string, a1?: string, a2?: string , a3?: string) => {
-                return `[[${a1?.split('/').map(f => { const check = /(\d+)\. ?(.+)/gsmi.exec(f); return check && check[2] ? check[2] : f }).join('/') ?? ''}${a2 ?? ''}${a3 ?? ''}]]`;
-            });
         case "file":
             return content;
         case "canvas":
             const data = JSON.parse(content) as CanvasContent;
-            data.edges.forEach(e => e.color = typeof e.color === 'string' ? getColor(e.color) : undefined);
-            data.nodes.forEach(e => e.color = typeof e.color === 'string' ? getColor(e.color) : undefined);
+            data.edges?.forEach(e => e.color = typeof e.color === 'string' ? getColor(e.color) : undefined);
+            data.nodes?.forEach(e => e.color = typeof e.color === 'string' ? getColor(e.color) : undefined);
             return JSON.stringify(data);
         default:
         case 'folder': 
diff --git a/shared/general.util.ts b/shared/general.util.ts
index 96ea3e0..712c6bf 100644
--- a/shared/general.util.ts
+++ b/shared/general.util.ts
@@ -14,7 +14,7 @@ export function unifySlug(slug: string | string[]): string
 }
 export function parsePath(path: string): string
 {
-    return path.toLowerCase().replaceAll(" ", "-").normalize("NFD").replaceAll(/[\u0300-\u036f]/g, "").replaceAll('(', '').replaceAll(')', '');
+    return path.toLowerCase().trim().replaceAll(" ", "-").normalize("NFD").replaceAll(/[\u0300-\u036f]/g, "").replaceAll('(', '').replaceAll(')', '');
 }
 export function parseId(id: string | undefined): string |undefined
 {