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

6 files changed, 125 insertions, 31 deletions

diff --git a/viewer/src/services/dragscrollclickfix.ts b/viewer/src/services/dragscrollclickfix.ts
index 38eb106..7125510 100644
--- a/viewer/src/services/dragscrollclickfix.ts
+++ b/viewer/src/services/dragscrollclickfix.ts
@@ -19,7 +19,6 @@
 
 // https://github.com/donmbelembe/vue-dragscroll/issues/61
 export default class DragScrollClickFix {
-
   readonly DRAG_DELAY = 250; // This is the minimal delay to consider a click to be a drag, mostly usefull for touch devices
 
   timer: NodeJS.Timeout | null = null;
@@ -39,7 +38,7 @@ export default class DragScrollClickFix {
       clearTimeout(this.timer);
       this.timer = null;
     }
-    setTimeout(() => this.dragging = false);
+    setTimeout(() => (this.dragging = false));
   }
 
   onClickCapture(e: MouseEvent) {
diff --git a/viewer/src/services/indexfactory.ts b/viewer/src/services/indexfactory.ts
index e402185..4b28a60 100644
--- a/viewer/src/services/indexfactory.ts
+++ b/viewer/src/services/indexfactory.ts
@@ -18,19 +18,19 @@
 */
 
 import { Operation } from "@/@types/Operation";
+import { ItemType } from "@/@types/ItemType";
 import Navigation from "@/services/navigation";
 
 export default class IndexFactory {
-
   public static generateTags(root: Gallery.Item | null): Tag.Index {
-    let tagsIndex: Tag.Index = {};
+    const tagsIndex: Tag.Index = {};
     if (root) IndexFactory.pushTagsForItem(tagsIndex, root);
     return tagsIndex;
   }
 
   // Pushes all tags for a root item (and its children) to the index
   private static pushTagsForItem(tagsIndex: Tag.Index, item: Gallery.Item): void {
-    if (item.properties.type === "directory") {
+    if (item.properties.type === ItemType.DIRECTORY) {
       item.properties.items.forEach(item => this.pushTagsForItem(tagsIndex, item));
       return; // Directories are not indexed
     }
@@ -50,7 +50,15 @@ export default class IndexFactory {
   }
 
   private static pushPartToIndex(index: Tag.Node, part: string, item: Gallery.Item, rootPart: boolean): Tag.Node {
-    if (!index) index = { tag: part, tagfiltered: Navigation.normalize(part), rootPart, childPart: !rootPart, items: [], children: {} };
+    if (!index)
+      index = {
+        tag: part,
+        tagfiltered: Navigation.normalize(part),
+        rootPart,
+        childPart: !rootPart,
+        items: [],
+        children: {},
+      };
     else if (rootPart) index.rootPart = true;
     else index.childPart = true;
 
@@ -60,7 +68,6 @@ export default class IndexFactory {
 
   // ---
 
-
   public static searchTags(tagsIndex: Tag.Index, filter: string, strict: boolean): Tag.Search[] {
     let search: Tag.Search[] = [];
     if (tagsIndex && filter) {
@@ -105,7 +112,12 @@ export default class IndexFactory {
       );
   }
 
-  private static searchTagsFromFilter(tagsIndex: Tag.Index, operation: Operation, filter: string, strict: boolean): Tag.Search[] {
+  private static searchTagsFromFilter(
+    tagsIndex: Tag.Index,
+    operation: Operation,
+    filter: string,
+    strict: boolean
+  ): Tag.Search[] {
     filter = Navigation.normalize(filter);
     return Object.values(tagsIndex)
       .filter(node => IndexFactory.matches(node, filter, strict))
@@ -114,7 +126,7 @@ export default class IndexFactory {
 
   private static matches(node: Tag.Node, filter: string, strict: boolean): boolean {
     if (strict) return node.tagfiltered === filter;
-    return node.tagfiltered.includes(filter)
+    return node.tagfiltered.includes(filter);
   }
 
   // ---
diff --git a/viewer/src/services/indexsearch.ts b/viewer/src/services/indexsearch.ts
index a55a829..00f8cfc 100644
--- a/viewer/src/services/indexsearch.ts
+++ b/viewer/src/services/indexsearch.ts
@@ -20,7 +20,6 @@
 import { Operation } from "@/@types/Operation";
 
 export default class IndexSearch {
-
   // Results of the search (by tags)
   public static search(searchTags: Tag.Search[]): Gallery.Item[] {
     const byOperation = this.extractTagsByOperation(searchTags);
@@ -30,7 +29,7 @@ export default class IndexSearch {
   }
 
   private static extractTagsByOperation(searchTags: Tag.Search[]): Tag.SearchByOperation {
-    let byOperation: Tag.SearchByOperation = {};
+    const byOperation: Tag.SearchByOperation = {};
     Object.values(Operation).forEach(
       operation => (byOperation[operation] = searchTags.filter(tag => tag.operation === operation))
     );
@@ -38,7 +37,7 @@ export default class IndexSearch {
   }
 
   private static extractIntersection(byOperation: Tag.SearchByOperation): Set<Gallery.Item> {
-    let intersection = new Set<Gallery.Item>();
+    const intersection = new Set<Gallery.Item>();
     if (byOperation[Operation.INTERSECTION].length > 0) {
       byOperation[Operation.INTERSECTION]
         .map(tag => tag.items)
@@ -50,7 +49,7 @@ export default class IndexSearch {
   }
 
   private static extractSubstraction(byOperation: Tag.SearchByOperation): Set<Gallery.Item> {
-    let substraction = new Set<Gallery.Item>();
+    const substraction = new Set<Gallery.Item>();
     if (byOperation[Operation.SUBSTRACTION].length > 0) {
       byOperation[Operation.SUBSTRACTION].flatMap(tag => tag.items).forEach(item => substraction.add(item));
     }
diff --git a/viewer/src/services/itemComparators.ts b/viewer/src/services/itemComparators.ts
new file mode 100644
index 0000000..bd9accb
--- /dev/null
+++ b/viewer/src/services/itemComparators.ts
@@ -0,0 +1,73 @@
+/* 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/>.
+*/
+import { TranslateResult } from "vue-i18n";
+import i18n from "@/plugins/i18n";
+
+export type ItemComparator = (left: Gallery.Item, right: Gallery.Item) => number;
+export type ItemSort = { text: TranslateResult; fn: ItemComparator };
+
+export default class ItemComparators {
+  static readonly ITEM_SORTS: Record<Gallery.ItemSortStr, ItemSort> = {
+    title_asc: {
+      text: i18n.t("command.sort.byTitleAsc"),
+      fn: ItemComparators.chain(ItemComparators.sortByTitleAsc, ItemComparators.sortByPathAsc),
+    },
+    date_asc: {
+      text: i18n.t("command.sort.byDateAsc"),
+      fn: ItemComparators.chain(ItemComparators.sortByDateAsc, ItemComparators.sortByPathAsc),
+    },
+    date_desc: {
+      text: i18n.t("command.sort.byDateDesc"),
+      fn: ItemComparators.reverse(ItemComparators.chain(ItemComparators.sortByDateAsc, ItemComparators.sortByPathAsc)),
+    },
+  };
+
+  static readonly DEFAULT = ItemComparators.ITEM_SORTS.date_asc;
+
+  static sortByPathAsc(left: Gallery.Item, right: Gallery.Item): number {
+    return left.path.localeCompare(right.path, undefined, {
+      sensitivity: "base",
+      ignorePunctuation: true,
+      numeric: true,
+    });
+  }
+