flatten md-directory into root for md-viewer

UnterrainerInformatik · Apr 16, 2024 · d86905a · d86905a
1 parent a4faf73
commit d86905a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/app.js b/app.js
@@ -299,7 +299,7 @@ initKeycloak(app).then(() => {
   });
 
   const basePath = process.env.NEXT_PUBLIC_IS_APP_FOLDER ? '/app/' : '.';
-  scanFiles(basePath).then(() => {
+  scanFiles("md/", path.join(basePath, "md")).then(() => {
     app.listen(process.env.NEXT_PUBLIC_PORT, "0.0.0.0");
   });
 

diff --git a/obsidian.js b/obsidian.js
@@ -103,6 +103,7 @@ export const callouts = {
 export const mdFilesMap = {};
 export const filesMap = {};
 export const mdFilesDir = {};
+export const mdFilesDirOnHdd = {};
 export let mdFilesDirStructure = {};
 export const mainFonts = {};
 export const mainFontsArray = [];
@@ -162,7 +163,10 @@ function makeSafeForCSS(name) {
   });
 }
 
-export async function scanFiles(dir, root = dir) {
+/**
+ * If it's the root dir, dirPrefix should be an empty string.
+ */
+export async function scanFiles(dirPrefix, dir, root = dir) {
   scanFilesInternal(dir, root);
   let mdFiles = await Promise.all(
     Object.keys(mdFilesDir).map(async (file) => {
@@ -174,6 +178,7 @@ export async function scanFiles(dir, root = dir) {
       }
       return {
         [file]: {
+          dirPrefix: dirPrefix,
           path: file,
           pathWithoutExt: pwe,
           folders: folders,
@@ -183,7 +188,7 @@ export async function scanFiles(dir, root = dir) {
           fileNameWithoutExtension: pwe.split("/").pop().split(".")[0],
           lastFolder: pwe.split("/").slice(-2, -1)[0] || "",
           cssName: makeSafeForCSS(folders),
-          permissions: await getPermissionsFor(file),
+          permissions: await getPermissionsFor(dirPrefix + file),
         },
       };
     })
@@ -793,7 +798,8 @@ function insertDirFolder(folder, j) {
 
 function insertDirLink(file, req, indent, i, files) {
   let r = "";
-  r += `<a href="/${file.path}" class="${
+  console.log(file);
+  r += `<a href="/${file.dirPrefix + file.path}" class="${
     "/" + file.path === decodeURIComponent(req.path) ? "highlight" : ""
   }">${indentStringFor(file.lastFolder === "" ? 0 : indent)}${
     file.fileNameWithoutExtension