Merge branch 'develop' for release v2.0v2.0

1 files changed, 25 insertions, 16 deletions

diff --git a/viewer/src/services/navigation.ts b/viewer/src/services/navigation.ts
index fa17990..5b0716d 100644
--- a/viewer/src/services/navigation.ts
+++ b/viewer/src/services/navigation.ts
@@ -17,12 +17,23 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { ItemType } from "@/@types/ItemType";
+
 export default class Navigation {
+  static readonly ICON_BY_TYPE: Record<ItemType, string> = {
+    directory: "folder",
+    picture: "image",
+    plaintext: "file-alt",
+    pdf: "file-pdf",
+    video: "file-video",
+    audio: "file-audio",
+    other: "file",
+  };
 
   // Searches for an item by path from a root item (navigation)
   public static searchCurrentItemPath(root: Gallery.Item, path: string): Gallery.Item[] {
     if (path === root.path) return [root];
-    if (root.properties.type === "directory" && path.startsWith(root.path)) {
+    if (root.properties.type === ItemType.DIRECTORY && path.startsWith(root.path)) {
       const itemChain = root.properties.items
         .map(item => this.searchCurrentItemPath(item, path))
         .find(itemChain => itemChain.length > 0);
@@ -40,14 +51,14 @@ export default class Navigation {
   }
 
   // Checks if the type of an item matches
-  public static checkType(item: Gallery.Item | null, type: Gallery.ItemType): boolean {
-    return item?.properties.type === type ?? false;
+  public static checkType(item: Gallery.Item | null, type: ItemType | null): boolean {
+    return (item?.properties.type ?? null) === type;
   }
 
   public static getLastDirectory(itemPath: Gallery.Item[]): Gallery.Directory {
     for (let idx = itemPath.length - 1; idx >= 0; idx--) {
       const item = itemPath[idx];
-      if (Navigation.checkType(item, "directory")) return item as Gallery.Directory;
+      if (Navigation.checkType(item, ItemType.DIRECTORY)) return item as Gallery.Directory;
     }
     throw new Error("No directory found");
   }
@@ -56,25 +67,23 @@ export default class Navigation {
   public static directoriesFirst(items: Gallery.Item[]) {
     return [
       ...items
-        .filter(child => Navigation.checkType(child, "directory"))
+        .filter(child => Navigation.checkType(child, ItemType.DIRECTORY))
         .sort((a, b) => a.title.localeCompare(b.title)),
 
-      ...items
-        .filter(child => !Navigation.checkType(child, "directory")),
+      ...items.filter(child => !Navigation.checkType(child, ItemType.DIRECTORY)),
     ];
   }
 
   // Get the icon for an item
   public static getIcon(item: Gallery.Item): string {
     if (item.path.length <= 1) return "home";
-    switch (item.properties.type) {
-      case "picture":
-        return "image";
-      case "directory":
-        return "folder";
-      case "other":
-      default:
-        return "file";
-    }
+    return Navigation.ICON_BY_TYPE[item.properties.type];
+  }
+
+  // Get the file name of an item, without its cache timestamp
+  public static getFileName(item: Gallery.Item): string {
+    if (item.properties.type === ItemType.DIRECTORY) return item.title;
+    const timeStamped = item.properties.resource.split("/").pop() ?? "";
+    return timeStamped.split("?")[0];
   }
 }