From 09624c0089f0e29ffb1abc578525b6a07fd95e81 Mon Sep 17 00:00:00 2001
From: pacien
Date: Sun, 3 May 2020 23:05:38 +0200
Subject: viewer/GallerySearch: use proper i18n pluralisation

---
 viewer/src/locales/en.json         | 3 +--
 viewer/src/views/GallerySearch.vue | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'viewer')

diff --git a/viewer/src/locales/en.json b/viewer/src/locales/en.json
index 9e0fd4b..e6c1df2 100644
--- a/viewer/src/locales/en.json
+++ b/viewer/src/locales/en.json
@@ -1,8 +1,7 @@
 {
   "tagInput.placeholder": "Filters",
   "tagInput.nomatch": "No match",
-  "search.no-results": "No results",
-  "search.no-results.otherfolders": "No results • {0} result{1} in other folders",
+  "search.no-result-fmt": "No result<br>({0} match in other folders) | No result<br>({0} matches in other folders)",
   "panelLeft.propositions": "Related filters",
   "tag-propositions.substraction": "Exclude items with this tag",
   "tag-propositions.addition": "Include all items with this tag",
diff --git a/viewer/src/views/GallerySearch.vue b/viewer/src/views/GallerySearch.vue
index e75a37e..dfaa5d3 100644
--- a/viewer/src/views/GallerySearch.vue
+++ b/viewer/src/views/GallerySearch.vue
@@ -29,8 +29,7 @@ import IndexSearch from "@/services/indexsearch";
 @Component
 export default class GalleryPicture extends Vue {
   @Prop(String) readonly path!: string;
-
-  otherCount: Number = 0;
+  otherCount: number = 0;
 
   mounted() {
     this.$uiStore.toggleFullscreen(false);
@@ -50,8 +49,7 @@ export default class GalleryPicture extends Vue {
   }
 
   noResult() {
-    const params = [this.otherCount, this.otherCount > 1 ? "s" : ""];
-    return this.$t("search.no-results.otherfolders", params);
+    return this.$tc("search.no-result-fmt", this.otherCount, [this.otherCount]);
   }
 }
 </script>
-- 
cgit v1.2.3


From 665139f7d25a64f66e1149a6403fc26efcbabb2a Mon Sep 17 00:00:00 2001
From: pacien
Date: Sun, 3 May 2020 23:07:51 +0200
Subject: viewer/GalleryNavigation: better error messages

Introducing a generic error page with some icon and a different error for unknown resources

GitHub: closes #190
---
 viewer/src/components/LdError.vue      | 64 ++++++++++++++++++++++++++++++++++
 viewer/src/components/LdGallery.vue    |  8 ++---
 viewer/src/locales/en.json             |  3 +-
 viewer/src/plugins/fontawesome.ts      |  2 ++
 viewer/src/views/GalleryNavigation.vue | 32 ++++++++++++-----
 5 files changed, 95 insertions(+), 14 deletions(-)
 create mode 100644 viewer/src/components/LdError.vue

(limited to 'viewer')

diff --git a/viewer/src/components/LdError.vue b/viewer/src/components/LdError.vue
new file mode 100644
index 0000000..5e266ab
--- /dev/null
+++ b/viewer/src/components/LdError.vue
@@ -0,0 +1,64 @@
+<!--
+-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2020  Pacien TRAN-GIRARD
+--
+-- 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 :class="$style.container">
+    <div :class="$style.content">
+      <fa-icon :class="$style.icon" :icon="icon" size="6x" />
+      <div :class="$style.message" v-html="message"></div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from "vue-property-decorator";
+
+@Component export default class LdError extends Vue {
+  @Prop({ required: true }) readonly icon!: string;
+  @Prop({ required: true }) readonly message!: string;
+}
+</script>
+
+<style lang="scss" module>
+@import "~@/assets/scss/theme.scss";
+
+.container {
+  min-height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.content {
+  text-align: center;
+
+  & > *:not(last-child) {
+    margin-bottom: 0.15em;
+  }
+}
+
+.icon {
+  color: $disabled-color;
+}
+
+.message {
+  color: $text-light;
+}
+</style>
diff --git a/viewer/src/components/LdGallery.vue b/viewer/src/components/LdGallery.vue
index 29c18b9..e512758 100644
--- a/viewer/src/components/LdGallery.vue
+++ b/viewer/src/components/LdGallery.vue
@@ -18,11 +18,11 @@
 -->
 
 <template>
-  <div class="thumbnail-tiles">
+  <ld-error v-if="hasNoResults()" icon="search" :message="noresult" />
+  <div v-else class="thumbnail-tiles">
     <router-link v-for="item in items" :key="item.path" :to="item.path">
       <ld-thumbnail :item="item" />
     </router-link>
-    <div v-if="hasNoResults()" class="noresult">{{noresult}}</div>
   </div>
 </template>
 
@@ -47,11 +47,9 @@ export default class LdPicture extends Vue {
   flex-wrap: wrap;
   align-items: center;
   justify-content: space-evenly;
+
   & > a {
     margin: 2px;
   }
-  & .noresult {
-    margin-top: 40px;
-  }
 }
 </style>
diff --git a/viewer/src/locales/en.json b/viewer/src/locales/en.json
index e6c1df2..c011552 100644
--- a/viewer/src/locales/en.json
+++ b/viewer/src/locales/en.json
@@ -7,7 +7,8 @@
   "tag-propositions.addition": "Include all items with this tag",
   "tag-propositions.intersection": "Search for this tag",
   "tag-propositions.item-count": "Item count",
-  "gallery.unknowntype": "Unknown item type",
+  "gallery.unknown-type": "Could not display item of unknown type",
+  "gallery.unknown-resource": "Resource not found",
   "command.search": "Open/close search panel",
   "command.search.clear": "Clear",
   "command.search.search": "Search",
diff --git a/viewer/src/plugins/fontawesome.ts b/viewer/src/plugins/fontawesome.ts
index 480e8e0..933bce6 100644
--- a/viewer/src/plugins/fontawesome.ts
+++ b/viewer/src/plugins/fontawesome.ts
@@ -23,6 +23,7 @@ import { library, config } from "@fortawesome/fontawesome-svg-core";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import {
   faFolder,
+  faFolderOpen,
   faEraser,
   faSearch,
   faPlus,
@@ -38,6 +39,7 @@ import {
 
 library.add(
   faFolder,
+  faFolderOpen,
   faEraser,
   faSearch,
   faPlus,
diff --git a/viewer/src/views/GalleryNavigation.vue b/viewer/src/views/GalleryNavigation.vue
index 7c6d11b..08c8218 100644
--- a/viewer/src/views/GalleryNavigation.vue
+++ b/viewer/src/views/GalleryNavigation.vue
@@ -18,18 +18,14 @@
 -->
 
 <template>
+  <!-- TODO: eliminate intermediate div -->
   <div>
-    <gallery-search v-if="query.length" :path="path" />
-    <gallery-directory v-else-if="checkType('directory')" :directory="$galleryStore.currentItem" />
-    <ld-picture v-else-if="checkType('picture')" :picture="$galleryStore.currentItem" />
-    <div v-else>{{$t("gallery.unknowntype")}}</div>
+    <component :is="dispatch().component" v-bind="dispatch().properties" />
   </div>
 </template>
 
 <script lang="ts">
 import { Component, Vue, Prop, Watch } from "vue-property-decorator";
-import { Operation } from "@/@types/Operation";
-import Navigation from "@/services/navigation";
 import GalleryDirectory from "./GalleryDirectory.vue";
 import GallerySearch from "@/views/GallerySearch.vue";
 
@@ -52,8 +48,28 @@ export default class GalleryNavigation extends Vue {
     this.$galleryStore.setCurrentPath(this.path);
   }
 
-  private checkType(type: Gallery.ItemType): boolean {
-    return Navigation.checkType(this.$galleryStore.currentItem, type);
+  dispatch(): { component: string, properties: {} } {
+    switch (this.$galleryStore.currentItem?.properties.type ?? null) {
+      case null:
+        return {
+          component: "ld-error",
+          properties: { icon: "folder-open", message: this.$t("gallery.unknown-resource") }
+        };
+
+      case "directory":
+        return this.query.length > 0
+          ? { component: "gallery-search", properties: { path: this.path } }
+          : { component: "gallery-directory", properties: { directory: this.$galleryStore.currentItem } };
+
+      case "picture":
+        return { component: "ld-picture", properties: { picture: this.$galleryStore.currentItem } };
+
+      default:
+        return {
+          component: "ld-error",
+          properties: { icon: "file", message: this.$t("gallery.unknown-type") }
+        };
+    }
   }
 }
 </script>
-- 
cgit v1.2.3


From f328a730b516f5e9104f85e553c083c2865660a8 Mon Sep 17 00:00:00 2001
From: pacien
Date: Mon, 4 May 2020 00:10:39 +0200
Subject: viewer/galleryStore: unify resource root parametrisation

---
 viewer/src/components/LdPicture.vue   | 2 +-
 viewer/src/components/LdThumbnail.vue | 2 +-
 viewer/src/store/galleryStore.ts      | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'viewer')

diff --git a/viewer/src/components/LdPicture.vue b/viewer/src/components/LdPicture.vue
index de46bcb..78829ec 100644
--- a/viewer/src/components/LdPicture.vue
+++ b/viewer/src/components/LdPicture.vue
@@ -76,7 +76,7 @@ export default class LdPicture extends Vue {
   }
 
   pictureSrc(resource: string) {
-    return `${process.env.VUE_APP_DATA_URL}${this.$galleryStore.config!.galleryRoot}${resource}`;
+    return this.$galleryStore.resourceRoot + resource;
   }
 
   generateSlowLoadingStyle() {
diff --git a/viewer/src/components/LdThumbnail.vue b/viewer/src/components/LdThumbnail.vue
index e774f00..bfcc595 100644
--- a/viewer/src/components/LdThumbnail.vue
+++ b/viewer/src/components/LdThumbnail.vue
@@ -47,7 +47,7 @@ export default class LdThumbnail extends Vue {
   loading: boolean = false;
 
   pictureSrc(resource: string) {
-    return `${process.env.VUE_APP_DATA_URL}${this.$galleryStore.config!.galleryRoot}${resource}`;
+    return this.$galleryStore.resourceRoot + resource;
   }
 
   pictureStyle() {
diff --git a/viewer/src/store/galleryStore.ts b/viewer/src/store/galleryStore.ts
index 0cffdd9..a57122c 100644
--- a/viewer/src/store/galleryStore.ts
+++ b/viewer/src/store/galleryStore.ts
@@ -79,6 +79,10 @@ export default class GalleryStore extends VuexModule {
     return this.galleryIndex?.properties.galleryTitle ?? "ldgallery";
   }
 
+  get resourceRoot(): string {
+    return process.env.VUE_APP_DATA_URL + this.config!.galleryRoot;
+  }
+
   // ---
 
   // Fetches the gallery's JSON config
-- 
cgit v1.2.3


From 35456c6183c199b23ded85838414eb28a6d4b60f Mon Sep 17 00:00:00 2001
From: pacien
Date: Mon, 4 May 2020 00:11:31 +0200
Subject: viewer/LdDownload: add generic file download handler

GitHub: closes #209
---
 viewer/src/@types/gallery.d.ts         |  1 +
 viewer/src/components/LdDownload.vue   | 67 ++++++++++++++++++++++++++++++++++
 viewer/src/locales/en.json             |  2 +-
 viewer/src/plugins/fontawesome.ts      |  2 +
 viewer/src/views/GalleryNavigation.vue |  5 +--
 5 files changed, 72 insertions(+), 5 deletions(-)
 create mode 100644 viewer/src/components/LdDownload.vue

(limited to 'viewer')

diff --git a/viewer/src/@types/gallery.d.ts b/viewer/src/@types/gallery.d.ts
index 066aedf..3246894 100644
--- a/viewer/src/@types/gallery.d.ts
+++ b/viewer/src/@types/gallery.d.ts
@@ -55,6 +55,7 @@ declare namespace Gallery {
   }
   interface OtherProperties {
     type: "other",
+    resource: string
   }
   interface PictureProperties {
     type: "picture",
diff --git a/viewer/src/components/LdDownload.vue b/viewer/src/components/LdDownload.vue
new file mode 100644
index 0000000..3b13e99
--- /dev/null
+++ b/viewer/src/components/LdDownload.vue
@@ -0,0 +1,67 @@
+<!--
+-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2020  Pacien TRAN-GIRARD
+--
+-- 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 :class="$style.container">
+    <a :class="$style.content" :download="itemFileName" :href="itemDownloadUrl">
+      <!-- TODO: show thumbnail instead of this generic file download icon? -->
+      <fa-icon :class="$style.icon" icon="file-download" size="6x" />
+      <div>{{ $t("download.download-file-fmt", [itemFileName]) }}</div>
+    </a>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from "vue-property-decorator";
+
+@Component export default class LdDownload extends Vue {
+  @Prop({ required: true }) readonly item!: Gallery.Item;
+
+  get itemResource(): string {
+    return (this.item.properties as Gallery.OtherProperties).resource;
+  }
+
+  get itemFileName(): string {
+    const timeStamped = this.itemResource.split("/").pop() ?? "";
+    return timeStamped.split("?")[0];
+  }
+
+  get itemDownloadUrl(): string {
+    return this.$galleryStore.resourceRoot + this.itemResource;
+  }
+}
+</script>
+
+<style lang="scss" module>
+.container {
+  min-height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.content {
+  text-align: center;
+}
+
+.icon {
+  margin-bottom: 0.15em;
+}
+</style>
diff --git a/viewer/src/locales/en.json b/viewer/src/locales/en.json
index c011552..824064e 100644
--- a/viewer/src/locales/en.json
+++ b/viewer/src/locales/en.json
@@ -7,8 +7,8 @@
   "tag-propositions.addition": "Include all items with this tag",
   "tag-propositions.intersection": "Search for this tag",
   "tag-propositions.item-count": "Item count",
-  "gallery.unknown-type": "Could not display item of unknown type",
   "gallery.unknown-resource": "Resource not found",
+  "download.download-file-fmt": "Download {0}",
   "command.search": "Open/close search panel",
   "command.search.clear": "Clear",
   "command.search.search": "Search",
diff --git a/viewer/src/plugins/fontawesome.ts b/viewer/src/plugins/fontawesome.ts
index 933bce6..886d680 100644
--- a/viewer/src/plugins/fontawesome.ts
+++ b/viewer/src/plugins/fontawesome.ts
@@ -35,6 +35,7 @@ import {
   faAngleRight,
   faAngleDoubleLeft,
   faFile,
+  faFileDownload,
 } from "@fortawesome/free-solid-svg-icons";
 
 library.add(
@@ -51,6 +52,7 @@ library.add(
   faAngleRight,
   faAngleDoubleLeft,
   faFile,
+  faFileDownload,
 );
 
 config.autoAddCss = false;
diff --git a/viewer/src/views/GalleryNavigation.vue b/viewer/src/views/GalleryNavigation.vue
index 08c8218..2e40409 100644
--- a/viewer/src/views/GalleryNavigation.vue
+++ b/viewer/src/views/GalleryNavigation.vue
@@ -65,10 +65,7 @@ export default class GalleryNavigation extends Vue {
         return { component: "ld-picture", properties: { picture: this.$galleryStore.currentItem } };
 
       default:
-        return {
-          component: "ld-error",
-          properties: { icon: "file", message: this.$t("gallery.unknown-type") }
-        };
+        return { component: "ld-download", properties: { item: this.$galleryStore.currentItem } };
     }
   }
 }
-- 
cgit v1.2.3


From c175db32132201cefec699b69f71fb23bdd2c687 Mon Sep 17 00:00:00 2001
From: pacien
Date: Fri, 8 May 2020 19:03:09 +0200
Subject: viewer/LdDownload: fix item type and remove getters

For consistency.
---
 viewer/src/components/LdDownload.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'viewer')

diff --git a/viewer/src/components/LdDownload.vue b/viewer/src/components/LdDownload.vue
index 3b13e99..f86d455 100644
--- a/viewer/src/components/LdDownload.vue
+++ b/viewer/src/components/LdDownload.vue
@@ -20,10 +20,10 @@
 
 <template>
   <div :class="$style.container">
-    <a :class="$style.content" :download="itemFileName" :href="itemDownloadUrl">
+    <a :class="$style.content" :download="itemFileName()" :href="itemDownloadUrl()">
       <!-- TODO: show thumbnail instead of this generic file download icon? -->
       <fa-icon :class="$style.icon" icon="file-download" size="6x" />
-      <div>{{ $t("download.download-file-fmt", [itemFileName]) }}</div>
+      <div>{{ $t("download.download-file-fmt", [itemFileName()]) }}</div>
     </a>
   </div>
 </template>
@@ -32,19 +32,19 @@
 import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component export default class LdDownload extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Item;
+  @Prop({ required: true }) readonly item!: Gallery.Other;
 
-  get itemResource(): string {
-    return (this.item.properties as Gallery.OtherProperties).resource;
+  itemResource(): string {
+    return this.item.properties.resource;
   }
 
-  get itemFileName(): string {
-    const timeStamped = this.itemResource.split("/").pop() ?? "";
+  itemFileName(): string {
+    const timeStamped = this.itemResource().split("/").pop() ?? "";
     return timeStamped.split("?")[0];
   }
 
-  get itemDownloadUrl(): string {
-    return this.$galleryStore.resourceRoot + this.itemResource;
+  itemDownloadUrl(): string {
+    return this.$galleryStore.resourceRoot + this.itemResource();
   }
 }
 </script>
-- 
cgit v1.2.3


From 3cf40298471995fddea8a66860353a2b1ceeeeee Mon Sep 17 00:00:00 2001
From: pacien
Date: Fri, 8 May 2020 19:04:29 +0200
Subject: viewer/LdError: fix prop constructor type

---
 viewer/src/components/LdError.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'viewer')

diff --git a/viewer/src/components/LdError.vue b/viewer/src/components/LdError.vue
index 5e266ab..4b958dc 100644
--- a/viewer/src/components/LdError.vue
+++ b/viewer/src/components/LdError.vue
@@ -31,8 +31,8 @@
 import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component export default class LdError extends Vue {
-  @Prop({ required: true }) readonly icon!: string;
-  @Prop({ required: true }) readonly message!: string;
+  @Prop({ required: true, type: String }) readonly icon!: string;
+  @Prop({ required: true, type: String }) readonly message!: string;
 }
 </script>
 
-- 
cgit v1.2.3


From e02b09f405c81fd3eb612b0bb1f78f5860b0a5e8 Mon Sep 17 00:00:00 2001
From: pacien
Date: Fri, 8 May 2020 19:10:52 +0200
Subject: viewer/style/global: factorise flex centering container

---
 viewer/src/assets/scss/global.scss   | 11 +++++++++++
 viewer/src/components/LdDownload.vue |  9 +--------
 viewer/src/components/LdError.vue    |  9 +--------
 3 files changed, 13 insertions(+), 16 deletions(-)

(limited to 'viewer')

diff --git a/viewer/src/assets/scss/global.scss b/viewer/src/assets/scss/global.scss
index 9444548..5d2e6dc 100644
--- a/viewer/src/assets/scss/global.scss
+++ b/viewer/src/assets/scss/global.scss
@@ -51,6 +51,17 @@ button svg + span {
   align-items: center;
 }
 
+/**
+ * Class for containers that centers its content vertically and horizontally,
+ * preferably sticking to the container start if the container is smaller than the content.
+ */
+.container-vh-centering {
+  min-height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 // === Links
 
 .link {
diff --git a/viewer/src/components/LdDownload.vue b/viewer/src/components/LdDownload.vue
index f86d455..aea4123 100644
--- a/viewer/src/components/LdDownload.vue
+++ b/viewer/src/components/LdDownload.vue
@@ -19,7 +19,7 @@
 -->
 
 <template>
-  <div :class="$style.container">
+  <div class="container-vh-centering">
     <a :class="$style.content" :download="itemFileName()" :href="itemDownloadUrl()">
       <!-- TODO: show thumbnail instead of this generic file download icon? -->
       <fa-icon :class="$style.icon" icon="file-download" size="6x" />
@@ -50,13 +50,6 @@ import { Component, Prop, Vue } from "vue-property-decorator";
 </script>
 
 <style lang="scss" module>
-.container {
-  min-height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
 .content {
   text-align: center;
 }
diff --git a/viewer/src/components/LdError.vue b/viewer/src/components/LdError.vue
index 4b958dc..a53942d 100644
--- a/viewer/src/components/LdError.vue
+++ b/viewer/src/components/LdError.vue
@@ -19,7 +19,7 @@
 -->
 
 <template>
-  <div :class="$style.container">
+  <div class="container-vh-centering">
     <div :class="$style.content">
       <fa-icon :class="$style.icon" :icon="icon" size="6x" />
       <div :class="$style.message" v-html="message"></div>
@@ -39,13 +39,6 @@ import { Component, Prop, Vue } from "vue-property-decorator";
 <style lang="scss" module>
 @import "~@/assets/scss/theme.scss";
 
-.container {
-  min-height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
 .content {
   text-align: center;
 
-- 
cgit v1.2.3


From 34bcf9339c86f145442b9edc799416462bf21fc5 Mon Sep 17 00:00:00 2001
From: pacien
Date: Fri, 8 May 2020 19:28:07 +0200
Subject: viewer/GalleryNavigation: revert to static template component
 dispatching

We'll see for dynamic component loading later.
---
 viewer/src/services/navigation.ts      |  4 ++--
 viewer/src/views/GalleryNavigation.vue | 28 ++++++++--------------------
 2 files changed, 10 insertions(+), 22 deletions(-)

(limited to 'viewer')

diff --git a/viewer/src/services/navigation.ts b/viewer/src/services/navigation.ts
index fa17990..aa7ef5e 100644
--- a/viewer/src/services/navigation.ts
+++ b/viewer/src/services/navigation.ts
@@ -40,8 +40,8 @@ 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: Gallery.ItemType | null): boolean {
+    return item?.properties.type === type;
   }
 
   public static getLastDirectory(itemPath: Gallery.Item[]): Gallery.Directory {
diff --git a/viewer/src/views/GalleryNavigation.vue b/viewer/src/views/GalleryNavigation.vue
index 2e40409..f36fc8a 100644
--- a/viewer/src/views/GalleryNavigation.vue
+++ b/viewer/src/views/GalleryNavigation.vue
@@ -20,12 +20,17 @@
 <template>
   <!-- TODO: eliminate intermediate div -->
   <div>
-    <component :is="dispatch().component" v-bind="dispatch().properties" />
+    <ld-error v-if="checkType(null)" icon="folder-open" :message="$t('gallery.unknown-resource')" />
+    <gallery-search v-else-if="checkType('directory') && query.length > 0" :path="path" />
+    <gallery-directory v-else-if="checkType('directory')" :directory="$galleryStore.currentItem" />
+    <ld-picture v-else-if="checkType('picture')" :picture="$galleryStore.currentItem" />
+    <ld-download v-else :item="$galleryStore.currentItem" />
   </div>
 </template>
 
 <script lang="ts">
 import { Component, Vue, Prop, Watch } from "vue-property-decorator";
+import Navigation from "@/services/navigation";
 import GalleryDirectory from "./GalleryDirectory.vue";
 import GallerySearch from "@/views/GallerySearch.vue";
 
@@ -48,25 +53,8 @@ export default class GalleryNavigation extends Vue {
     this.$galleryStore.setCurrentPath(this.path);
   }
 
-  dispatch(): { component: string, properties: {} } {
-    switch (this.$galleryStore.currentItem?.properties.type ?? null) {
-      case null:
-        return {
-          component: "ld-error",
-          properties: { icon: "folder-open", message: this.$t("gallery.unknown-resource") }
-        };
-
-      case "directory":
-        return this.query.length > 0
-          ? { component: "gallery-search", properties: { path: this.path } }
-          : { component: "gallery-directory", properties: { directory: this.$galleryStore.currentItem } };
-
-      case "picture":
-        return { component: "ld-picture", properties: { picture: this.$galleryStore.currentItem } };
-
-      default:
-        return { component: "ld-download", properties: { item: this.$galleryStore.currentItem } };
-    }
+  checkType(type: Gallery.ItemType | null): boolean {
+    return Navigation.checkType(this.$galleryStore.currentItem, type);
   }
 }
 </script>
-- 
cgit v1.2.3


From edf3dc50aad464b31e4b1f2a1a3980ca023b9588 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Sun, 10 May 2020 15:09:05 +0200
Subject: viewer: code simplification;fontawesome import

---
 viewer/src/plugins/fontawesome-icons.ts | 35 +++++++++++++++++++++++++++++++++
 viewer/src/plugins/fontawesome.ts       | 34 ++------------------------------
 2 files changed, 37 insertions(+), 32 deletions(-)
 create mode 100644 viewer/src/plugins/fontawesome-icons.ts

(limited to 'viewer')

diff --git a/viewer/src/plugins/fontawesome-icons.ts b/viewer/src/plugins/fontawesome-icons.ts
new file mode 100644
index 0000000..2f45f2c
--- /dev/null
+++ b/viewer/src/plugins/fontawesome-icons.ts
@@ -0,0 +1,35 @@
+/* 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 {
+  faFolder,
+  faFolderOpen,
+  faEraser,
+  faSearch,
+  faPlus,
+  faMinus,
+  faImage,
+  faHome,
+  faArrowLeft,
+  faLevelUpAlt,
+  faAngleRight,
+  faAngleDoubleLeft,
+  faFile,
+  faFileDownload,
+} from "@fortawesome/free-solid-svg-icons";
diff --git a/viewer/src/plugins/fontawesome.ts b/viewer/src/plugins/fontawesome.ts
index 886d680..25ddd99 100644
--- a/viewer/src/plugins/fontawesome.ts
+++ b/viewer/src/plugins/fontawesome.ts
@@ -21,39 +21,9 @@ import Vue from "vue";
 
 import { library, config } from "@fortawesome/fontawesome-svg-core";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import {
-  faFolder,
-  faFolderOpen,
-  faEraser,
-  faSearch,
-  faPlus,
-  faMinus,
-  faImage,
-  faHome,
-  faArrowLeft,
-  faLevelUpAlt,
-  faAngleRight,
-  faAngleDoubleLeft,
-  faFile,
-  faFileDownload,
-} from "@fortawesome/free-solid-svg-icons";
+import * as faIcons from "./fontawesome-icons";
 
-library.add(
-  faFolder,
-  faFolderOpen,
-  faEraser,
-  faSearch,
-  faPlus,
-  faMinus,
-  faImage,
-  faHome,
-  faArrowLeft,
-  faLevelUpAlt,
-  faAngleRight,
-  faAngleDoubleLeft,
-  faFile,
-  faFileDownload,
-);
+library.add(faIcons);
 
 config.autoAddCss = false;
 import "@fortawesome/fontawesome-svg-core/styles.css";
-- 
cgit v1.2.3


From 0e2a0e0ff6fd4818eea1be5bc139d99642e5daef Mon Sep 17 00:00:00 2001
From: Notkea
Date: Sun, 10 May 2020 15:12:18 +0200
Subject: viewer/navigation: fix undefined check

item? may return undefined, and undefined === null returns false.

Co-authored-by: OzoneGrif <OzoneGrif@users.noreply.github.com>---
 viewer/src/services/navigation.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'viewer')

diff --git a/viewer/src/services/navigation.ts b/viewer/src/services/navigation.ts
index aa7ef5e..1869702 100644
--- a/viewer/src/services/navigation.ts
+++ b/viewer/src/services/navigation.ts
@@ -41,7 +41,7 @@ export default class Navigation {
 
   // Checks if the type of an item matches
   public static checkType(item: Gallery.Item | null, type: Gallery.ItemType | null): boolean {
-    return item?.properties.type === type;
+    return (item?.properties.type ?? null) === type;
   }
 
   public static getLastDirectory(itemPath: Gallery.Item[]): Gallery.Directory {
-- 
cgit v1.2.3


From 04d5cb917f4288c26a308dfda4ba788d77fda8fd Mon Sep 17 00:00:00 2001
From: pacien
Date: Wed, 13 May 2020 00:18:16 +0200
Subject: compiler: add plain text file format support through simple copy

---
 viewer/src/@types/gallery.d.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'viewer')

diff --git a/viewer/src/@types/gallery.d.ts b/viewer/src/@types/gallery.d.ts
index 3246894..04df1bb 100644
--- a/viewer/src/@types/gallery.d.ts
+++ b/viewer/src/@types/gallery.d.ts
@@ -37,6 +37,9 @@ declare namespace Gallery {
   interface Picture extends Item {
     properties: PictureProperties,
   }
+  interface PlainText extends Item {
+    properties: PlainTextProperties,
+  }
   interface Directory extends Item {
     properties: DirectoryProperties,
   }
@@ -47,7 +50,7 @@ declare namespace Gallery {
     tags: RawTag[],
     path: string,
     thumbnail?: Thumbnail
-    properties: OtherProperties | PictureProperties | DirectoryProperties,
+    properties: OtherProperties | PictureProperties | PlainTextProperties | DirectoryProperties,
   }
   interface Resolution {
     width: number,
@@ -62,6 +65,10 @@ declare namespace Gallery {
     resource: string,
     resolution: Resolution
   }
+  interface PlainTextProperties {
+    type: "plaintext",
+    resource: string,
+  }
   interface DirectoryProperties {
     type: "directory",
     items: Item[]
@@ -71,5 +78,5 @@ declare namespace Gallery {
     resolution: Resolution
   }
   type RawTag = string;
-  type ItemType = "other" | "picture" | "directory";
+  type ItemType = "other" | "picture" | "plaintext" | "directory";
 }
-- 
cgit v1.2.3


From acffcad3f554be95ff728fb84df96d26094d0cc5 Mon Sep 17 00:00:00 2001
From: pacien
Date: Wed, 13 May 2020 00:43:40 +0200
Subject: viewer: use different icon for plain text files

---
 viewer/src/plugins/fontawesome-icons.ts | 1 +
 viewer/src/services/navigation.ts       | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'viewer')

diff --git a/viewer/src/plugins/fontawesome-icons.ts b/viewer/src/plugins/fontawesome-icons.ts
index 2f45f2c..b5df176 100644
--- a/viewer/src/plugins/fontawesome-icons.ts
+++ b/viewer/src/plugins/fontawesome-icons.ts
@@ -31,5 +31,6 @@ export {
   faAngleRight,
   faAngleDoubleLeft,
   faFile,
+  faFileAlt,
   faFileDownload,
 } from "@fortawesome/free-solid-svg-icons";
diff --git a/viewer/src/services/navigation.ts b/viewer/src/services/navigation.ts
index 1869702..4d3b376 100644
--- a/viewer/src/services/navigation.ts
+++ b/viewer/src/services/navigation.ts
@@ -70,6 +70,8 @@ export default class Navigation {
     switch (item.properties.type) {
       case "picture":
         return "image";
+      case "plaintext":
+        return "file-alt";
       case "directory":
         return "folder";
       case "other":
-- 
cgit v1.2.3


From 8063119d3ee2182a595b2e53ee2bbc557a8a56c3 Mon Sep 17 00:00:00 2001
From: pacien
Date: Wed, 13 May 2020 00:18:46 +0200
Subject: viewer: add plain text file viewer

GitHub: closes #213
---
 viewer/src/components/LdPlainTextViewer.vue | 61 +++++++++++++++++++++++++++++
 viewer/src/views/GalleryNavigation.vue      |  1 +
 2 files changed, 62 insertions(+)
 create mode 100644 viewer/src/components/LdPlainTextViewer.vue

(limited to 'viewer')

diff --git a/viewer/src/components/LdPlainTextViewer.vue b/viewer/src/components/LdPlainTextViewer.vue
new file mode 100644
index 0000000..1dbd351
--- /dev/null
+++ b/viewer/src/components/LdPlainTextViewer.vue
@@ -0,0 +1,61 @@
+<!--
+-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2020  Pacien TRAN-GIRARD
+--
+-- 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>
+  <!-- Outer div necessary for the resize handle to appear on Firefox. -->
+  <div :class="$style.content">
+    <!-- Using an iframe here to let the browser deal with content encoding detection. -->
+    <iframe :src="itemResourceUrl()" />
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from "vue-property-decorator";
+
+@Component export default class LdPlainTextViewer extends Vue {
+  @Prop({ required: true }) readonly plainTextItem!: Gallery.PlainText;
+
+  itemResourceUrl(): string {
+    return this.$galleryStore.resourceRoot + this.plainTextItem.properties.resource;
+  }
+}
+</script>
+
+<style lang="scss" module>
+.content {
+  margin: auto; // Old-school horizontal centering.
+  width: 100%;
+  height: 100%;
+
+  // Allow the user to adjust the width of the text view for easier column reading.
+  resize: horizontal;
+  max-width: 100%; // Forbid overflow when resizing.
+  overflow: hidden; // Necessary for the resize handle to be shown in Chromium.
+  padding: .5em; // Necessary for the resize handle to be selectable on qutebrowser.
+
+  // Re-normalise page colour.
+  background-color: white;
+
+  & > iframe {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/viewer/src/views/GalleryNavigation.vue b/viewer/src/views/GalleryNavigation.vue
index f36fc8a..b5f06a2 100644
--- a/viewer/src/views/GalleryNavigation.vue
+++ b/viewer/src/views/GalleryNavigation.vue
@@ -24,6 +24,7 @@
     <gallery-search v-else-if="checkType('directory') && query.length > 0" :path="path" />
     <gallery-directory v-else-if="checkType('directory')" :directory="$galleryStore.currentItem" />
     <ld-picture v-else-if="checkType('picture')" :picture="$galleryStore.currentItem" />
+    <ld-plain-text-viewer v-else-if="checkType('plaintext')" :plain-text-item="$galleryStore.currentItem" />
     <ld-download v-else :item="$galleryStore.currentItem" />
   </div>
 </template>
-- 
cgit v1.2.3


From e9e46a3b3392ab435f7414729592b2b5af4071b6 Mon Sep 17 00:00:00 2001
From: pacien
Date: Mon, 18 May 2020 20:05:14 +0200
Subject: compiler: add pdf resource type

---
 viewer/src/@types/gallery.d.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'viewer')

diff --git a/viewer/src/@types/gallery.d.ts b/viewer/src/@types/gallery.d.ts
index 04df1bb..7345ef9 100644
--- a/viewer/src/@types/gallery.d.ts
+++ b/viewer/src/@types/gallery.d.ts
@@ -40,6 +40,9 @@ declare namespace Gallery {
   interface PlainText extends Item {
     properties: PlainTextProperties,
   }
+  interface PDF extends Item {
+    properties: PDFProperties,
+  }
   interface Directory extends Item {
     properties: DirectoryProperties,
   }
@@ -50,7 +53,7 @@ declare namespace Gallery {
     tags: RawTag[],
     path: string,
     thumbnail?: Thumbnail
-    properties: OtherProperties | PictureProperties | PlainTextProperties | DirectoryProperties,
+    properties: OtherProperties | PictureProperties | PlainTextProperties | PDFProperties | DirectoryProperties,
   }
   interface Resolution {
     width: number,
@@ -69,6 +72,10 @@ declare namespace Gallery {
     type: "plaintext",
     resource: string,
   }
+  interface PDFProperties {
+    type: "pdf",
+    resource: string,
+  }
   interface DirectoryProperties {
     type: "directory",
     items: Item[]
@@ -78,5 +85,5 @@ declare namespace Gallery {
     resolution: Resolution
   }
   type RawTag = string;
-  type ItemType = "other" | "picture" | "plaintext" | "directory";
+  type ItemType = "other" | "picture" | "plaintext" | "pdf" | "directory";
 }
-- 
cgit v1.2.3


From 185b84fbed180e4d2da7d4cc2ee91a3481f47406 Mon Sep 17 00:00:00 2001
From: pacien
Date: Mon, 18 May 2020 20:05:32 +0200
Subject: viewer: add icon for pdf files

---
 viewer/src/plugins/fontawesome-icons.ts | 1 +
 viewer/src/services/navigation.ts       | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'viewer')

diff --git a/viewer/src/plugins/fontawesome-icons.ts b/viewer/src/plugins/fontawesome-icons.ts
index b5df176..ffe3709 100644
--- a/viewer/src/plugins/fontawesome-icons.ts
+++ b/viewer/src/plugins/fontawesome-icons.ts
@@ -32,5 +32,6 @@ export {
   faAngleDoubleLeft,
   faFile,
   faFileAlt,
+  faFilePdf,
   faFileDownload,
 } from "@fortawesome/free-solid-svg-icons";
diff --git a/viewer/src/services/navigation.ts b/viewer/src/services/navigation.ts
index 4d3b376..7d1ae50 100644
--- a/viewer/src/services/navigation.ts
+++ b/viewer/src/services/navigation.ts
@@ -72,6 +72,8 @@ export default class Navigation {
         return "image";
       case "plaintext":
         return "file-alt";
+      case "pdf":
+        return "file-pdf";
       case "directory":
         return "folder";
       case "other":
-- 
cgit v1.2.3


From 226e0beb50061844470bd8a717a74307b975bd96 Mon Sep 17 00:00:00 2001
From: pacien
Date: Mon, 18 May 2020 20:06:22 +0200
Subject: viewer: add pdf viewer

Based on native browser rendering.

GitHub: closes #211
---
 viewer/src/components/LdPdfViewer.vue  | 50 ++++++++++++++++++++++++++++++++++
 viewer/src/views/GalleryNavigation.vue |  1 +
 2 files changed, 51 insertions(+)
 create mode 100644 viewer/src/components/LdPdfViewer.vue

(limited to 'viewer')

diff --git a/viewer/src/components/LdPdfViewer.vue b/viewer/src/components/LdPdfViewer.vue
new file mode 100644
index 0000000..78ff3d2
--- /dev/null
+++ b/viewer/src/components/LdPdfViewer.vue
@@ -0,0 +1,50 @@
+<!--
+-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2020  Pacien TRAN-GIRARD
+--
+-- 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>
+  <!-- intermediate container necessary to eliminate the double scrollbar -->
+  <div :class="$style.container">
+    <!-- prefer native browser PDF viewer if available -->
+    <object :class="$style.content" :data="itemResourceUrl()" type="application/pdf">
+      <!-- TODO: fallback to PDF.js (https://github.com/pacien/ldgallery/issues/212) -->
+      <ld-download :item="pdfItem" />
+    </object>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from "vue-property-decorator";
+
+@Component export default class LdPdfViewer extends Vue {
+  @Prop({ required: true }) readonly pdfItem!: Gallery.PDF;
+
+  itemResourceUrl(): string {
+    return this.$galleryStore.resourceRoot + this.pdfItem.properties.resource;
+  }
+}
+</script>
+
+<style lang="scss" module>
+.container, .content {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}
+</style>
diff --git a/viewer/src/views/GalleryNavigation.vue b/viewer/src/views/GalleryNavigation.vue
index b5f06a2..e1c860b 100644
--- a/viewer/src/views/GalleryNavigation.vue
+++ b/viewer/src/views/GalleryNavigation.vue
@@ -25,6 +25,7 @@
     <gallery-directory v-else-if="checkType('directory')" :directory="$galleryStore.currentItem" />
     <ld-picture v-else-if="checkType('picture')" :picture="$galleryStore.currentItem" />
     <ld-plain-text-viewer v-else-if="checkType('plaintext')" :plain-text-item="$galleryStore.currentItem" />
+    <ld-pdf-viewer v-else-if="checkType('pdf')" :pdf-item="$galleryStore.currentItem" />
     <ld-download v-else :item="$galleryStore.currentItem" />
   </div>
 </template>
-- 
cgit v1.2.3


From 037db071d42d4a7fdb8ed5cf88bc2c37fba4ae93 Mon Sep 17 00:00:00 2001
From: pacien
Date: Tue, 19 May 2020 21:04:50 +0200
Subject: viewer/css/global: factorise util classes

---
 viewer/src/assets/scss/global.scss          |  8 ++++++++
 viewer/src/components/LdPdfViewer.vue       | 10 +++-------
 viewer/src/components/LdPlainTextViewer.vue | 11 ++---------
 3 files changed, 13 insertions(+), 16 deletions(-)

(limited to 'viewer')

diff --git a/viewer/src/assets/scss/global.scss b/viewer/src/assets/scss/global.scss
index 5d2e6dc..f95a54d 100644
--- a/viewer/src/assets/scss/global.scss
+++ b/viewer/src/assets/scss/global.scss
@@ -36,6 +36,9 @@ button svg + span {
 .nowrap {
   white-space: nowrap;
 }
+.no-scroll {
+  overflow: hidden;
+}
 .no-scroll-x {
   overflow-x: hidden;
 }
@@ -51,6 +54,11 @@ button svg + span {
   align-items: center;
 }
 
+.fill {
+  width: 100%;
+  height: 100%;
+}
+
 /**
  * Class for containers that centers its content vertically and horizontally,
  * preferably sticking to the container start if the container is smaller than the content.
diff --git a/viewer/src/components/LdPdfViewer.vue b/viewer/src/components/LdPdfViewer.vue
index 78ff3d2..20055cc 100644
--- a/viewer/src/components/LdPdfViewer.vue
+++ b/viewer/src/components/LdPdfViewer.vue
@@ -20,9 +20,9 @@
 
 <template>
   <!-- intermediate container necessary to eliminate the double scrollbar -->
-  <div :class="$style.container">
+  <div class="fill no-scroll">
     <!-- prefer native browser PDF viewer if available -->
-    <object :class="$style.content" :data="itemResourceUrl()" type="application/pdf">
+    <object class="fill" :data="itemResourceUrl()" type="application/pdf">
       <!-- TODO: fallback to PDF.js (https://github.com/pacien/ldgallery/issues/212) -->
       <ld-download :item="pdfItem" />
     </object>
@@ -42,9 +42,5 @@ import { Component, Prop, Vue } from "vue-property-decorator";
 </script>
 
 <style lang="scss" module>
-.container, .content {
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-}
+
 </style>
diff --git a/viewer/src/components/LdPlainTextViewer.vue b/viewer/src/components/LdPlainTextViewer.vue
index 1dbd351..101fd4c 100644
--- a/viewer/src/components/LdPlainTextViewer.vue
+++ b/viewer/src/components/LdPlainTextViewer.vue
@@ -20,9 +20,9 @@
 
 <template>
   <!-- Outer div necessary for the resize handle to appear on Firefox. -->
-  <div :class="$style.content">
+  <div :class="$style.content" class="fill">
     <!-- Using an iframe here to let the browser deal with content encoding detection. -->
-    <iframe :src="itemResourceUrl()" />
+    <iframe class="fill" :src="itemResourceUrl()" />
   </div>
 </template>
 
@@ -41,8 +41,6 @@ import { Component, Prop, Vue } from "vue-property-decorator";
 <style lang="scss" module>
 .content {
   margin: auto; // Old-school horizontal centering.
-  width: 100%;
-  height: 100%;
 
   // Allow the user to adjust the width of the text view for easier column reading.
   resize: horizontal;
@@ -52,10 +50,5 @@ import { Component, Prop, Vue } from "vue-property-decorator";
 
   // Re-normalise page colour.
   background-color: white;
-
-  & > iframe {
-    width: 100%;
-    height: 100%;
-  }
 }
 </style>
-- 
cgit v1.2.3


From a2e06f0a217b12d92cecdad77c20de88037f9912 Mon Sep 17 00:00:00 2001
From: pacien
Date: Tue, 19 May 2020 21:05:28 +0200
Subject: viewer/navigation: factorise item file name extraction

---
 viewer/src/components/LdDownload.vue | 10 +++-------
 viewer/src/services/navigation.ts    |  7 +++++++
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'viewer')

diff --git a/viewer/src/components/LdDownload.vue b/viewer/src/components/LdDownload.vue
index aea4123..d7dfb7d 100644
--- a/viewer/src/components/LdDownload.vue
+++ b/viewer/src/components/LdDownload.vue
@@ -30,21 +30,17 @@
 
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-property-decorator";
+import Navigation from "@/services/navigation";
 
 @Component export default class LdDownload extends Vue {
   @Prop({ required: true }) readonly item!: Gallery.Other;
 
-  itemResource(): string {
-    return this.item.properties.resource;
-  }
-
   itemFileName(): string {
-    const timeStamped = this.itemResource().split("/").pop() ?? "";
-    return timeStamped.split("?")[0];
+    return Navigation.getFileName(this.item);
   }
 
   itemDownloadUrl(): string {
-    return this.$galleryStore.resourceRoot + this.itemResource();
+    return this.$galleryStore.resourceRoot + this.item.properties.resource;
   }
 }
 </script>
diff --git a/viewer/src/services/navigation.ts b/viewer/src/services/navigation.ts
index 7d1ae50..f96904d 100644
--- a/viewer/src/services/navigation.ts
+++ b/viewer/src/services/navigation.ts
@@ -81,4 +81,11 @@ export default class Navigation {
         return "file";
     }
   }
+
+  // Get the file name of an item, without its cache timestamp
+  public static getFileName(item: Gallery.Item): string {
+    if (item.properties.type === "directory") return item.title;
+    const timeStamped = item.properties.resource.split("/").pop() ?? "";
+    return timeStamped.split("?")[0];
+  }
 }
-- 
cgit v1.2.3


From 516ee7c5599f2c90a636fd9301806bef67830046 Mon Sep 17 00:00:00 2001
From: pacien
Date: Tue, 19 May 2020 21:06:16 +0200
Subject: compiler: add audio and video extensions

---
 viewer/src/@types/gallery.d.ts | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'viewer')

diff --git a/viewer/src/@types/gallery.d.ts b/viewer/src/@types/gallery.d.ts
index 7345ef9..2407f98 100644
--- a/viewer/src/@types/gallery.d.ts
+++ b/viewer/src/@types/gallery.d.ts
@@ -43,6 +43,12 @@ declare namespace Gallery {
   interface PDF extends Item {
     properties: PDFProperties,
   }
+  interface Video extends Item {
+    properties: VideoProperties,
+  }
+  interface Audio extends Item {
+    properties: AudioProperties,
+  }
   interface Directory extends Item {
     properties: DirectoryProperties,
   }
@@ -53,7 +59,13 @@ declare namespace Gallery {
     tags: RawTag[],
     path: string,
     thumbnail?: Thumbnail
-    properties: OtherProperties | PictureProperties | PlainTextProperties | PDFProperties | DirectoryProperties,
+    properties: OtherProperties
+      | PictureProperties
+      | PlainTextProperties
+      | PDFProperties
+      | VideoProperties
+      | AudioProperties
+      | DirectoryProperties,
   }
   interface Resolution {
     width: number,
@@ -76,6 +88,14 @@ declare namespace Gallery {
     type: "pdf",
     resource: string,
   }
+  interface VideoProperties {
+    type: "video",
+    resource: string,
+  }
+  interface AudioProperties {
+    type: "audio",
+    resource: string,
+  }
   interface DirectoryProperties {
     type: "directory",
     items: Item[]
@@ -85,5 +105,5 @@ declare namespace Gallery {
     resolution: Resolution
   }
   type RawTag = string;
-  type ItemType = "other" | "picture" | "plaintext" | "pdf" | "directory";
+  type ItemType = "other" | "picture" | "plaintext" | "pdf" | "video" | "audio" | "directory";
 }
-- 
cgit v1.2.3


From 932d6449094920d7ca10f76eeaac58e142d2763b Mon Sep 17 00:00:00 2001
From: pacien
Date: Tue, 19 May 2020 21:09:58 +0200
Subject: viewer: add audio and video icons

---
 viewer/src/plugins/fontawesome-icons.ts | 2 ++
 viewer/src/services/navigation.ts       | 4 ++++
 2 files changed, 6 insertions(+)

(limited to 'viewer')

diff --git a/viewer/src/plugins/fontawesome-icons.ts b/viewer/src/plugins/fontawesome-icons.ts
index ffe3709..51eda7e 100644
--- a/viewer/src/plugins/fontawesome-icons.ts
+++ b/viewer/src/plugins/fontawesome-icons.ts
@@ -33,5 +33,7 @@ export {
   faFile,
   faFileAlt,
   faFilePdf,
+  faFileVideo,
+  faFileAudio,
   faFileDownload,
 } from "@fortawesome/free-solid-svg-icons";
diff --git a/viewer/src/services/navigation.ts b/viewer/src/services/navigation.ts
index f96904d..068d081 100644
--- a/viewer/src/services/navigation.ts
+++ b/viewer/src/services/navigation.ts
@@ -74,6 +74,10 @@ export default class Navigation {
         return "file-alt";
       case "pdf":
         return "file-pdf";
+      case "video":
+        return "file-video";
+      case "audio":
+        return "file-audio";
       case "directory":
         return "folder";
       case "other":
-- 
cgit v1.2.3


From bc640b96052d657d22e0afbc05dc1ab4d0289bfb Mon Sep 17 00:00:00 2001
From: pacien
Date: Tue, 19 May 2020 21:10:37 +0200
Subject: viewer/LdVideoViewer: add video viewer

GitHub: closes #222
---
 viewer/src/components/LdVideoViewer.vue | 50 +++++++++++++++++++++++++++++++++
 viewer/src/views/GalleryNavigation.vue  |  1 +
 2 files changed, 51 insertions(+)
 create mode 100644 viewer/src/components/LdVideoViewer.vue

(limited to 'viewer')

diff --git a/viewer/src/components/LdVideoViewer.vue b/viewer/src/components/LdVideoViewer.vue
new file mode 100644
index 0000000..49f687f
--- /dev/null
+++ b/viewer/src/components/LdVideoViewer.vue
@@ -0,0 +1,50 @@
+<!--
+-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2020  Pacien TRAN-GIRARD
+--
+-- 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>
+  <!-- intermediate container necessary to eliminate the scrollbar -->
+  <div class="fill no-scroll">
+    <video class="fill" :src="itemResourceUrl()" :poster="thumbnailResourceUrl()" preload="auto" controls>
+      <ld-download :item="videoItem" />
+    </video>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from "vue-property-decorator";
+
+@Component export default class LdVideoViewer extends Vue {
+  @Prop({ required: true }) readonly videoItem!: Gallery.Video;
+
+  itemResourceUrl(): string {
+    return this.$galleryStore.resourceRoot + this.videoItem.properties.resource;
+  }
+
+  thumbnailResourceUrl(): string {
+    return this.videoItem.thumbnail
+      ? this.$galleryStore.resourceRoot + this.videoItem.thumbnail.resource
+      : "";
+  }
+}
+</script>
+
+<style lang="scss" module>
+
+</style>
diff --git a/viewer/src/views/GalleryNavigation.vue b/viewer/src/views/GalleryNavigation.vue
index e1c860b..df738b8 100644
--- a/viewer/src/views/GalleryNavigation.vue
+++ b/viewer/src/views/GalleryNavigation.vue
@@ -26,6 +26,7 @@
     <ld-picture v-else-if="checkType('picture')" :picture="$galleryStore.currentItem" />
     <ld-plain-text-viewer v-else-if="checkType('plaintext')" :plain-text-item="$galleryStore.currentItem" />
     <ld-pdf-viewer v-else-if="checkType('pdf')" :pdf-item="$galleryStore.currentItem" />
+    <ld-video-viewer v-else-if="checkType('video')" :video-item="$galleryStore.currentItem" />
     <ld-download v-else :item="$galleryStore.currentItem" />
   </div>
 </template>
-- 
cgit v1.2.3


From 9adf35eef92ee0842a080a6462ba13d4a17eb5e3 Mon Sep 17 00:00:00 2001
From: pacien
Date: Tue, 19 May 2020 21:11:07 +0200
Subject: viewer/LdAudioViewer: add audio viewer

GitHub: closes #158
---
 viewer/src/components/LdAudioViewer.vue | 56 +++++++++++++++++++++++++++++++++
 viewer/src/views/GalleryNavigation.vue  |  1 +
 2 files changed, 57 insertions(+)
 create mode 100644 viewer/src/components/LdAudioViewer.vue

(limited to 'viewer')

diff --git a/viewer/src/components/LdAudioViewer.vue b/viewer/src/components/LdAudioViewer.vue
new file mode 100644
index 0000000..d115a34
--- /dev/null
+++ b/viewer/src/components/LdAudioViewer.vue
@@ -0,0 +1,56 @@
+<!--
+-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2020  Pacien TRAN-GIRARD
+--
+-- 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 class="flex-column container-vh-centering">
+    <ld-thumbnail :item="audioItem" />
+    <audio :class="$style.player" :src="itemResourceUrl()" preload="auto" controls>
+      <a :download="itemFileName()" :href="itemResourceUrl()">
+        {{ $t("download.download-file-fmt", [itemFileName()]) }}
+      </a>
+    </audio>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from "vue-property-decorator";
+import Navigation from "@/services/navigation";
+
+@Component export default class LdAudioViewer extends Vue {
+  @Prop({ required: true }) readonly audioItem!: Gallery.Audio;
+
+  itemResourceUrl(): string {
+    return this.$galleryStore.resourceRoot + this.audioItem.properties.resource;
+  }
+
+  itemFileName(): string {
+    return Navigation.getFileName(this.audioItem);
+  }
+}
+</script>
+
+<style lang="scss" module>
+.player {
+  width: 100%;
+  max-width: 500px;
+  margin-top: 1em;
+  text-align: center; // for fallback download link
+}
+</style>
diff --git a/viewer/src/views/GalleryNavigation.vue b/viewer/src/views/GalleryNavigation.vue
index df738b8..9fc40e1 100644
--- a/viewer/src/views/GalleryNavigation.vue
+++ b/viewer/src/views/GalleryNavigation.vue
@@ -27,6 +27,7 @@
     <ld-plain-text-viewer v-else-if="checkType('plaintext')" :plain-text-item="$galleryStore.currentItem" />
     <ld-pdf-viewer v-else-if="checkType('pdf')" :pdf-item="$galleryStore.currentItem" />
     <ld-video-viewer v-else-if="checkType('video')" :video-item="$galleryStore.currentItem" />
+    <ld-audio-viewer v-else-if="checkType('audio')" :audio-item="$galleryStore.currentItem" />
     <ld-download v-else :item="$galleryStore.currentItem" />
   </div>
 </template>
-- 
cgit v1.2.3


From e20f99b74b55fdb3edbcfe5bfdb700fc1a5e9574 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 22 May 2020 04:07:34 +0200
Subject: viewer: npm build:report command, to generate ./dist/report.html

---
 viewer/.vscode/tasks.json | 86 ++++++++++++++++++++++++++---------------------
 viewer/package.json       |  1 +
 2 files changed, 49 insertions(+), 38 deletions(-)

(limited to 'viewer')

diff --git a/viewer/.vscode/tasks.json b/viewer/.vscode/tasks.json
index 102002d..cb1cdb2 100644
--- a/viewer/.vscode/tasks.json
+++ b/viewer/.vscode/tasks.json
@@ -1,39 +1,49 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=733558 
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "type": "npm",
-            "script": "build",
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "problemMatcher": [
-                "$tsc"
-            ]
-        },
-        {
-            "type": "npm",
-            "script": "serve",
-            "problemMatcher": [
-                "$tsc"
-            ]
-        },
-        {
-            "type": "npm",
-            "script": "lint-autoformat",
-            "problemMatcher": [
-                "$tsc"
-            ]
-        },
-        {
-            "type": "npm",
-            "script": "lint",
-            "problemMatcher": [
-                "$tsc"
-            ]
-        }
-    ]
-}
\ No newline at end of file
+  // See https://go.microsoft.com/fwlink/?LinkId=733558 
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type": "npm",
+      "script": "build",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": [
+        "$tsc"
+      ]
+    },
+    {
+      "type": "npm",
+      "script": "serve",
+      "problemMatcher": [
+        "$tsc"
+      ]
+    },
+    {
+      "type": "npm",
+      "script": "lint-autoformat",
+      "problemMatcher": [
+        "$tsc"
+      ]
+    },
+    {
+      "type": "npm",
+      "script": "lint",
+      "problemMatcher": [
+        "$tsc"
+      ]
+    },
+    {
+      "type": "npm",
+      "script": "build:report",
+      "problemMatcher": [
+        "$tsc"
+      ],
+      "group": "build",
+      "label": "npm: build:report",
+      "detail": "vue-cli-service build --report",
+    }
+  ]
+}
diff --git a/viewer/package.json b/viewer/package.json
index 0e2c48f..d1bb5a2 100644
--- a/viewer/package.json
+++ b/viewer/package.json
@@ -7,6 +7,7 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build --modern",
+    "build:report": "vue-cli-service build --report",
     "lint": "vue-cli-service lint --no-fix",
     "lint-autoformat": "vue-cli-service lint --fix",
     "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue|ts)' --locales './src/locales/*.json'"
-- 
cgit v1.2.3


From 74c1c5e34787ac57299c8cbd874e9dcc56da406d Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 22 May 2020 04:14:48 +0200
Subject: viewer: Enumerated item types

---
 viewer/src/@types/ItemType.ts          | 11 +++++++++++
 viewer/src/@types/gallery.d.ts         | 27 +++++++++++++--------------
 viewer/src/services/indexfactory.ts    |  3 ++-
 viewer/src/services/navigation.ts      | 34 +++++++++++++++-------------------
 viewer/src/views/GalleryNavigation.vue | 26 ++++++++++++++++++--------
 5 files changed, 59 insertions(+), 42 deletions(-)
 create mode 100644 viewer/src/@types/ItemType.ts

(limited to 'viewer')

diff --git a/viewer/src/@types/ItemType.ts b/viewer/src/@types/ItemType.ts
new file mode 100644
index 0000000..31a395b
--- /dev/null
+++ b/viewer/src/@types/ItemType.ts
@@ -0,0 +1,11 @@
+// TODO: Convert all ambiant types related to LdGallery to modules
+
+export enum ItemType {
+  OTHER = "other",
+  PICTURE = "picture",
+  PLAINTEXT = "plaintext",
+  PDF = "pdf",
+  VIDEO = "video",
+  AUDIO = "audio",
+  DIRECTORY = "directory",
+}
diff --git a/viewer/src/@types/gallery.d.ts b/viewer/src/@types/gallery.d.ts
index 2407f98..151ae92 100644
--- a/viewer/src/@types/gallery.d.ts
+++ b/viewer/src/@types/gallery.d.ts
@@ -60,44 +60,44 @@ declare namespace Gallery {
     path: string,
     thumbnail?: Thumbnail
     properties: OtherProperties
-      | PictureProperties
-      | PlainTextProperties
-      | PDFProperties
-      | VideoProperties
-      | AudioProperties
-      | DirectoryProperties,
+    | PictureProperties
+    | PlainTextProperties
+    | PDFProperties
+    | VideoProperties
+    | AudioProperties
+    | DirectoryProperties,
   }
   interface Resolution {
     width: number,
     height: number,
   }
   interface OtherProperties {
-    type: "other",
+    type: import("./ItemType").ItemType.OTHER,
     resource: string
   }
   interface PictureProperties {
-    type: "picture",
+    type: import("./ItemType").ItemType.PICTURE,
     resource: string,
     resolution: Resolution
   }
   interface PlainTextProperties {
-    type: "plaintext",
+    type: import("./ItemType").ItemType.PLAINTEXT,
     resource: string,
   }
   interface PDFProperties {
-    type: "pdf",
+    type: import("./ItemType").ItemType.PDF,
     resource: string,
   }
   interface VideoProperties {
-    type: "video",
+    type: import("./ItemType").ItemType.VIDEO,
     resource: string,
   }
   interface AudioProperties {
-    type: "audio",
+    type: import("./ItemType").ItemType.AUDIO,
     resource: string,
   }
   interface DirectoryProperties {
-    type: "directory",
+    type: import("./ItemType").ItemType.DIRECTORY,
     items: Item[]
   }
   interface Thumbnail {
@@ -105,5 +105,4 @@ declare namespace Gallery {
     resolution: Resolution
   }
   type RawTag = string;
-  type ItemType = "other" | "picture" | "plaintext" | "pdf" | "video" | "audio" | "directory";
 }
diff --git a/viewer/src/services/indexfactory.ts b/viewer/src/services/indexfactory.ts
index e402185..00abc05 100644
--- a/viewer/src/services/indexfactory.ts
+++ b/viewer/src/services/indexfactory.ts
@@ -18,6 +18,7 @@
 */
 
 import { Operation } from "@/@types/Operation";
+import { ItemType } from "@/@types/ItemType";
 import Navigation from "@/services/navigation";
 
 export default class IndexFactory {
@@ -30,7 +31,7 @@ export default class IndexFactory {
 
   // 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
     }
diff --git a/viewer/src/services/navigation.ts b/viewer/src/services/navigation.ts
index 068d081..a7e752c 100644
--- a/viewer/src/services/navigation.ts
+++ b/viewer/src/services/navigation.ts
@@ -17,12 +17,14 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { ItemType } from "@/@types/ItemType";
+
 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)) {
+    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 +42,14 @@ export default class Navigation {
   }
 
   // Checks if the type of an item matches
-  public static checkType(item: Gallery.Item | null, type: Gallery.ItemType | null): boolean {
+  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,11 +58,11 @@ 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")),
+        .filter(child => !Navigation.checkType(child, ItemType.DIRECTORY)),
     ];
   }
 
@@ -68,19 +70,13 @@ export default class Navigation {
   public static getIcon(item: Gallery.Item): string {
     if (item.path.length <= 1) return "home";
     switch (item.properties.type) {
-      case "picture":
-        return "image";
-      case "plaintext":
-        return "file-alt";
-      case "pdf":
-        return "file-pdf";
-      case "video":
-        return "file-video";
-      case "audio":
-        return "file-audio";
-      case "directory":
-        return "folder";
-      case "other":
+      case ItemType.PICTURE: return "image";
+      case ItemType.PLAINTEXT: return "file-alt";
+      case ItemType.PDF: return "file-pdf";
+      case ItemType.VIDEO: return "file-video";
+      case ItemType.AUDIO: return "file-audio";
+      case ItemType.DIRECTORY: return "folder";
+      case ItemType.OTHER: