From 76af6cffce939ef3c9a0952e6f7adc234e92f782 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Thu, 30 Jan 2020 17:04:09 +0100
Subject: viewer: directories first and sorted by title in the navigation mode

---
 viewer/src/@types/gallery/index.d.ts  |   9 ++-
 viewer/src/router/index.ts            |   2 +-
 viewer/src/tools.ts                   |  17 ++++++
 viewer/src/views/Gallery.vue          | 104 --------------------------------
 viewer/src/views/GalleryDirectory.vue |   8 ++-
 viewer/src/views/MainGallery.vue      | 108 ++++++++++++++++++++++++++++++++++
 6 files changed, 141 insertions(+), 107 deletions(-)
 delete mode 100644 viewer/src/views/Gallery.vue
 create mode 100644 viewer/src/views/MainGallery.vue

(limited to 'viewer')

diff --git a/viewer/src/@types/gallery/index.d.ts b/viewer/src/@types/gallery/index.d.ts
index 25407e8..b112b6d 100644
--- a/viewer/src/@types/gallery/index.d.ts
+++ b/viewer/src/@types/gallery/index.d.ts
@@ -18,6 +18,9 @@
 */
 
 declare namespace Gallery {
+    interface Other extends Item {
+        properties: OtherProperties,
+    }
     interface Picture extends Item {
         properties: PictureProperties,
     }
@@ -31,7 +34,10 @@ declare namespace Gallery {
         tags: RawTag[],
         path: string,
         thumbnail?: string,
-        properties: PictureProperties | DirectoryProperties,
+        properties: OtherProperties | PictureProperties | DirectoryProperties,
+    }
+    interface OtherProperties {
+        type: "other",
     }
     interface PictureProperties {
         type: "picture",
@@ -42,4 +48,5 @@ declare namespace Gallery {
         items: Item[]
     }
     type RawTag = string;
+    type ItemType = "other" | "picture" | "directory";
 }
\ No newline at end of file
diff --git a/viewer/src/router/index.ts b/viewer/src/router/index.ts
index 55b4b6c..0f3d2c7 100644
--- a/viewer/src/router/index.ts
+++ b/viewer/src/router/index.ts
@@ -19,7 +19,7 @@
 
 import Vue from "vue";
 import VueRouter from "vue-router";
-import Gallery from "@/views/Gallery.vue";
+import Gallery from "@/views/MainGallery.vue";
 
 Vue.use(VueRouter);
 
diff --git a/viewer/src/tools.ts b/viewer/src/tools.ts
index 5eb287e..57a889d 100644
--- a/viewer/src/tools.ts
+++ b/viewer/src/tools.ts
@@ -27,4 +27,21 @@ export default class Tools {
       .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 => Tools.checkType(child, "directory"))
+        .sort((a, b) => a.title.localeCompare(b.title)),
+
+      ...items
+        .filter(child => !Tools.checkType(child, "directory")),
+    ];
+  }
+
+
 }
\ No newline at end of file
diff --git a/viewer/src/views/Gallery.vue b/viewer/src/views/Gallery.vue
deleted file mode 100644
index fad7cc3..0000000
--- a/viewer/src/views/Gallery.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<!-- 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/>.
--->
-
-<template>
-  <div>
-    <gallery-search v-if="$uiStore.isModeSearch" :items="currentSearch" />
-    <gallery-directory v-else-if="checkType('directory')" :directory="$galleryStore.currentItem" />
-    <gallery-picture v-else-if="checkType('picture')" :picture="$galleryStore.currentItem" />
-    <div v-else>{{$t("gallery.unknowntype")}}</div>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Vue, Prop, Watch } from "vue-property-decorator";
-import { Operation } from '@/@types/tag/Operation';
-import GallerySearch from "./GallerySearch.vue";
-import GalleryDirectory from "./GalleryDirectory.vue";
-import GalleryPicture from "./GalleryPicture.vue";
-
-@Component({
-  components: { GallerySearch, GalleryDirectory, GalleryPicture },
-})
-export default class Gallery extends Vue {
-  @Prop(String) readonly pathMatch!: string;
-
-  mounted() {
-    this.pathChanged()
-  }
-
-  @Watch("pathMatch")
-  pathChanged() {
-    console.log("Path: ", this.pathMatch);
-    this.$galleryStore.setCurrentPath(this.pathMatch);
-  }
-
-  // Results of the search (by tags)
-  get currentSearch(): Gallery.Item[] {
-    const byOperation = this.extractTagsByOperation(this.$uiStore.currentTags);
-    const intersection = this.extractIntersection(byOperation);
-    const substraction = this.extractSubstraction(byOperation);
-    return this.aggregateAll(byOperation, intersection, substraction);
-  }
-
-  // ---
-
-  private checkType(type: string): boolean {
-    return this.$galleryStore.currentItem?.properties.type === type ?? false;
-  }
-
-  private extractTagsByOperation(currentTags: Tag.Search[]): Tag.SearchByOperation {
-    let byOperation: Tag.SearchByOperation = {};
-    Object.values(Operation)
-      .forEach(operation => byOperation[operation] = currentTags.filter(tag => tag.operation === operation));
-    return byOperation;
-  }
-
-  private extractIntersection(byOperation: Tag.SearchByOperation): Set<Gallery.Item> {
-    let intersection = new Set<Gallery.Item>();
-    if (byOperation[Operation.INTERSECTION].length > 0) {
-      byOperation[Operation.INTERSECTION]
-        .map(tag => tag.items)
-        .reduce((a,b) => a.filter(c => b.includes(c)))
-        .flatMap(items=>items)
-        .forEach(item => intersection.add(item));
-    }
-    return intersection;
-  }
-
-  private extractSubstraction(byOperation: Tag.SearchByOperation): Set<Gallery.Item> {
-    let substraction = new Set<Gallery.Item>();
-    if (byOperation[Operation.SUBSTRACTION].length > 0) {
-      byOperation[Operation.SUBSTRACTION]
-        .flatMap(tag => tag.items)
-        .forEach(item => substraction.add(item));
-    }
-    return substraction;
-  }
-
-  private aggregateAll(byOperation: Tag.SearchByOperation, intersection: Set<Gallery.Item>, substraction: Set<Gallery.Item>): Gallery.Item[] {
-    byOperation[Operation.ADDITION].flatMap(tag => tag.items).forEach(item => intersection.add(item));
-    substraction.forEach(item => intersection.delete(item));
-    return [...intersection];
-  }
-}
-</script>
-
-<style lang="scss">
-</style>
diff --git a/viewer/src/views/GalleryDirectory.vue b/viewer/src/views/GalleryDirectory.vue
index 1df0c4d..d01032d 100644
--- a/viewer/src/views/GalleryDirectory.vue
+++ b/viewer/src/views/GalleryDirectory.vue
@@ -19,7 +19,7 @@
 
 <template>
   <div class="thumbnail-tiles">
-    <div v-for="(item) in directory.properties.items" :key="item.path">
+    <div v-for="(item) in orderedItems" :key="item.path">
       <router-link :to="item.path">
         <gallery-thumbnail :item="item" />
       </router-link>
@@ -32,13 +32,19 @@
 
 <script lang="ts">
 import { Component, Vue, Prop } from "vue-property-decorator";
+import Tools from "@/tools";
 import GalleryThumbnail from "./GalleryThumbnail.vue";
+import Gallery from "./Gallery.vue";
 
 @Component({
   components: { GalleryThumbnail },
 })
 export default class GalleryDirectory extends Vue {
   @Prop({ required: true }) readonly directory!: Gallery.Directory;
+
+  get orderedItems() {
+    return Tools.directoriesFirst(this.directory.properties.items);
+  }
 }
 </script>
 
diff --git a/viewer/src/views/MainGallery.vue b/viewer/src/views/MainGallery.vue
new file mode 100644
index 0000000..06cf512
--- /dev/null
+++ b/viewer/src/views/MainGallery.vue
@@ -0,0 +1,108 @@
+<!-- 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/>.
+-->
+
+<template>
+  <div>
+    <gallery-search v-if="$uiStore.isModeSearch" :items="currentSearch" />
+    <gallery-directory v-else-if="checkType('directory')" :directory="$galleryStore.currentItem" />
+    <gallery-picture v-else-if="checkType('picture')" :picture="$galleryStore.currentItem" />
+    <div v-else>{{$t("gallery.unknowntype")}}</div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop, Watch } from "vue-property-decorator";
+import { Operation } from "@/@types/tag/Operation";
+import Tools from "@/tools";
+import GallerySearch from "./GallerySearch.vue";
+import GalleryDirectory from "./GalleryDirectory.vue";
+import GalleryPicture from "./GalleryPicture.vue";
+
+@Component({
+  components: { GallerySearch, GalleryDirectory, GalleryPicture },
+})
+export default class Gallery extends Vue {
+  @Prop(String) readonly pathMatch!: string;
+
+  mounted() {
+    this.pathChanged();
+  }
+
+  @Watch("pathMatch")
+  pathChanged() {
+    console.log("Path: ", this.pathMatch);
+    this.$galleryStore.setCurrentPath(this.pathMatch);
+  }
+
+  // Results of the search (by tags)
+  get currentSearch(): Gallery.Item[] {
+    const byOperation = this.extractTagsByOperation(this.$uiStore.currentTags);
+    const intersection = this.extractIntersection(byOperation);
+    const substraction = this.extractSubstraction(byOperation);
+    return this.aggregateAll(byOperation, intersection, substraction);
+  }
+
+  // ---
+
+  private checkType(type: Gallery.ItemType): boolean {
+    return Tools.checkType(this.$galleryStore.currentItem, type);
+  }
+
+  private extractTagsByOperation(currentTags: Tag.Search[]): Tag.SearchByOperation {
+    let byOperation: Tag.SearchByOperation = {};
+    Object.values(Operation).forEach(
+      operation => (byOperation[operation] = currentTags.filter(tag => tag.operation === operation))
+    );
+    return byOperation;
+  }
+
+  private extractIntersection(byOperation: Tag.SearchByOperation): Set<Gallery.Item> {
+    let intersection = new Set<Gallery.Item>();
+    if (byOperation[Operation.INTERSECTION].length > 0) {
+      byOperation[Operation.INTERSECTION]
+        .map(tag => tag.items)
+        .reduce((a, b) => a.filter(c => b.includes(c)))
+        .flatMap(items => items)
+        .forEach(item => intersection.add(item));
+    }
+    return intersection;
+  }
+
+  private extractSubstraction(byOperation: Tag.SearchByOperation): Set<Gallery.Item> {
+    let substraction = new Set<Gallery.Item>();
+    if (byOperation[Operation.SUBSTRACTION].length > 0) {
+      byOperation[Operation.SUBSTRACTION].flatMap(tag => tag.items).forEach(item => substraction.add(item));
+    }
+    return substraction;
+  }
+
+  private aggregateAll(
+    byOperation: Tag.SearchByOperation,
+    intersection: Set<Gallery.Item>,
+    substraction: Set<Gallery.Item>
+  ): Gallery.Item[] {
+    byOperation[Operation.ADDITION].flatMap(tag => tag.items).forEach(item => intersection.add(item));
+    substraction.forEach(item => intersection.delete(item));
+    return [...intersection];
+  }
+}
+</script>
+
+<style lang="scss">
+</style>
-- 
cgit v1.2.3