From 370e3db3455f548699ff5e046e0f8dcc304991ac Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 14 Feb 2020 09:19:53 +0100
Subject: viewer: major code and search mode overhaul

Updated libraries to the lastest version
SCSS Formatter as suggested VSC extensions
Renamed toolbar-color by scrollbar-color
LD components use Props in favor of touching the stores directly (when possible)
Moved most common algorithms to a "services" folder
Complete search overhaul (lots of code change)
---
 viewer/src/services/navigation.ts | 71 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 viewer/src/services/navigation.ts

(limited to 'viewer/src/services/navigation.ts')

diff --git a/viewer/src/services/navigation.ts b/viewer/src/services/navigation.ts
new file mode 100644
index 0000000..77fa47a
--- /dev/null
+++ b/viewer/src/services/navigation.ts
@@ -0,0 +1,71 @@
+/* ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2020  Guillaume FOUET
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU Affero General Public License as
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Affero General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+export default class Navigation {
+
+  // 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)) {
+      const itemChain = root.properties.items
+        .map(item => this.searchCurrentItemPath(item, path))
+        .find(itemChain => itemChain.length > 0);
+      if (itemChain) return [root, ...itemChain];
+    }
+    return [];
+  }
+
+
+  // Normalize a string to lowercase, no-accents
+  public static normalize(value: string) {
+    return value
+      .normalize("NFD")
+      .replace(/[\u0300-\u036f]/g, "")
+      .toLowerCase();
+  }
+
+
+  public static checkType(item: Gallery.Item | null, type: Gallery.ItemType): boolean {
+    return item?.properties.type === type ?? false;
+  }
+
+  public static directoriesFirst(items: Gallery.Item[]) {
+    return [
+      ...items
+        .filter(child => Navigation.checkType(child, "directory"))
+        .sort((a, b) => a.title.localeCompare(b.title)),
+
+      ...items
+        .filter(child => !Navigation.checkType(child, "directory")),
+    ];
+  }
+
+  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";
+    }
+  }
+}
-- 
cgit v1.2.3


From b252a96d47529749bb1d5e7a8d06fb7ce284b4ee Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Sun, 23 Feb 2020 18:19:33 +0100
Subject: viewer: searching when viewing a picture will return to the parent
 directory

Code review fix
---
 viewer/src/services/navigation.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'viewer/src/services/navigation.ts')

diff --git a/viewer/src/services/navigation.ts b/viewer/src/services/navigation.ts
index 77fa47a..fa17990 100644
--- a/viewer/src/services/navigation.ts
+++ b/viewer/src/services/navigation.ts
@@ -31,7 +31,6 @@ export default class Navigation {
     return [];
   }
 
-
   // Normalize a string to lowercase, no-accents
   public static normalize(value: string) {
     return value
@@ -40,11 +39,20 @@ export default class Navigation {
       .toLowerCase();
   }
 
-
+  // 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 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;
+    }
+    throw new Error("No directory found");
+  }
+
+  // Sort a list of items, moving the directories to the beginning of the list
   public static directoriesFirst(items: Gallery.Item[]) {
     return [
       ...items
@@ -56,6 +64,7 @@ export default class Navigation {
     ];
   }
 
+  // Get the icon for an item
   public static getIcon(item: Gallery.Item): string {
     if (item.path.length <= 1) return "home";
     switch (item.properties.type) {
-- 
cgit v1.2.3