From c4a51940295d514dd52f48b6f18638ac554224f4 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Wed, 29 Jan 2020 05:35:35 +0100
Subject: viewer: Tag auto-completion should be more flexible. Resolves #38

---
 viewer/src/@types/tag/index.d.ts     |  1 +
 viewer/src/components/LdTagInput.vue |  7 +++++--
 viewer/src/store/galleryStore.ts     |  3 ++-
 viewer/src/tools.ts                  | 30 ++++++++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 viewer/src/tools.ts

(limited to 'viewer/src')

diff --git a/viewer/src/@types/tag/index.d.ts b/viewer/src/@types/tag/index.d.ts
index c77fc3b..1d5df88 100644
--- a/viewer/src/@types/tag/index.d.ts
+++ b/viewer/src/@types/tag/index.d.ts
@@ -20,6 +20,7 @@
 declare namespace Tag {
     interface Node {
         tag: Gallery.RawTag;
+        tagfiltered: Gallery.RawTag;
         items: Gallery.Item[];
         children: Index;
     }
diff --git a/viewer/src/components/LdTagInput.vue b/viewer/src/components/LdTagInput.vue
index 71131e6..7c9981f 100644
--- a/viewer/src/components/LdTagInput.vue
+++ b/viewer/src/components/LdTagInput.vue
@@ -42,6 +42,7 @@
 <script lang="ts">
 import { Component, Vue } from "vue-property-decorator";
 import { Operation } from "@/@types/tag/Operation";
+import Tools from "@/tools";
 
 @Component
 export default class LdTagInput extends Vue {
@@ -92,18 +93,20 @@ export default class LdTagInput extends Vue {
     category: string,
     disambiguation: string
   ): Tag.Search[] {
+    disambiguation = Tools.normalize(disambiguation);
     return Object.values(tags)
       .filter(node => node.tag.includes(category))
       .flatMap(node =>
         Object.values(node.children)
-          .filter(child => child.tag.includes(disambiguation))
+          .filter(child => child.tagfiltered.includes(disambiguation))
           .map(child => ({ ...child, parent: node, operation, display: `${operation}${node.tag}:${child.tag}` }))
       );
   }
 
   searchTagsFromFilter(tags: Tag.Index, operation: Operation, filter: string): Tag.Search[] {
+    filter = Tools.normalize(filter);
     return Object.values(tags)
-      .filter(node => node.tag.includes(filter))
+      .filter(node => node.tagfiltered.includes(filter))
       .map(node => ({ ...node, operation, display: `${operation}${node.tag}` }));
   }
 
diff --git a/viewer/src/store/galleryStore.ts b/viewer/src/store/galleryStore.ts
index c4a039f..663340f 100644
--- a/viewer/src/store/galleryStore.ts
+++ b/viewer/src/store/galleryStore.ts
@@ -18,6 +18,7 @@
 */
 
 import { createModule, mutation, action } from "vuex-class-component";
+import Tools from '@/tools';
 
 const VuexModule = createModule({
     namespaced: "galleryStore",
@@ -88,7 +89,7 @@ export default class GalleryStore extends VuexModule {
             const parts = tag.split('.');
             let lastPart: string | null = null;
             for (const part of parts) {
-                if (!index[part]) index[part] = { tag: part, items: [], children: {} };
+                if (!index[part]) index[part] = { tag: part, tagfiltered: Tools.normalize(part), items: [], children: {} };
                 if (!index[part].items.includes(item)) index[part].items.push(item);
                 if (lastPart) index[lastPart].children[part] = index[part];
                 lastPart = part;
diff --git a/viewer/src/tools.ts b/viewer/src/tools.ts
new file mode 100644
index 0000000..5eb287e
--- /dev/null
+++ b/viewer/src/tools.ts
@@ -0,0 +1,30 @@
+/* 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 Tools {
+
+  // Normalize a string to lowercase, no-accents
+  public static normalize(value: string) {
+    return value
+      .normalize("NFD")
+      .replace(/[\u0300-\u036f]/g, "")
+      .toLowerCase();
+  }
+
+}
\ No newline at end of file
-- 
cgit v1.2.3