feat(#82): refactor dirParent func into utils/path.ts as getParentName

jannis-baum · Jul 14, 2024 · 4d876ea · 4d876ea
1 parent 7cfbdae
commit 4d876ea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/routes/viewer.ts b/src/routes/viewer.ts
@@ -1,11 +1,11 @@
 import { lstatSync, readFileSync } from 'fs';
-import { dirname as pdirname, basename as pbasename, join as pjoin } from 'path';
+import { dirname as pdirname, join as pjoin } from 'path';
 
 import { Request, Response, Router } from 'express';
 
 import { messageClientsAt } from '../app';
 import config from '../parser/config';
-import { pathToURL, pcomponents, pmime } from '../utils/path';
+import { pathToURL, pcomponents, pmime, getParentName } from '../utils/path';
 import { renderDirectory, renderTextFile } from '../parser/parser';
 
 export const router = Router();
@@ -22,14 +22,6 @@ const pageTitle = (path: string) => {
     } else return pjoin(...comps.slice(-2));
 };
 
-const dirParent = (path: string) => {
-    let parent = pbasename(pdirname(path));
-    if (!parent) {
-        parent = '/ (root)';
-    }
-    return parent;
-};
-
 router.get(/.*/, async (req: Request, res: Response) => {
     const path = res.locals.filepath;
 
@@ -75,7 +67,7 @@ router.get(/.*/, async (req: Request, res: Response) => {
                   ${config.styles}
                 </style>
             <body>
-                <a id="parent-dir" data-parent-folder="${dirParent(path)}" href="${pathToURL(pdirname(path))}"></a>
+                <a id="parent-dir" data-parent-folder="${getParentName(path)}" href="${pathToURL(pdirname(path))}"></a>
                 <div id="body-content">
                     ${body}
                 </div>

diff --git a/src/utils/path.ts b/src/utils/path.ts
@@ -29,3 +29,11 @@ export const urlToPath = (url: string) => {
 
 export const pathToURL = (path: string, route: string = 'viewer') =>
     `/${route}${encodeURIComponent(path).replaceAll('%2F', '/')}`;
+
+export const getParentName = (path: string) => {
+    let parentName = pbasename(pdirname(path));
+    if (!parentName) {
+        parentName = '/ (root)';
+    }
+    return parentName;
+};