From a4425869ea15234fee79b7d1219a3bea7ffb23a2 Mon Sep 17 00:00:00 2001
From: pacien
Date: Fri, 25 Jun 2021 12:03:55 +0200
Subject: license: make it more obvious for end users

---
 compiler/app/Main.hs     | 3 ++-
 viewer/public/index.html | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/compiler/app/Main.hs b/compiler/app/Main.hs
index e71e0db..dc97b38 100644
--- a/compiler/app/Main.hs
+++ b/compiler/app/Main.hs
@@ -1,7 +1,7 @@
 -- ldgallery - A static generator which turns a collection of tagged
 --             pictures into a searchable web gallery.
 --
--- Copyright (C) 2019-2020  Pacien TRAN-GIRARD
+-- Copyright (C) 2019-2021  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
@@ -94,6 +94,7 @@ options = Options
   }
 
   &= summary ("ldgallery v" ++ showVersion version ++ " - a static web gallery generator with tags")
+  &= details ["This software is distributed under the terms of the GNU Affero General Public License v3.0."]
   &= program "ldgallery"
   &= help "Compile a gallery"
   &= helpArg [explicit, name "h", name "help"]
diff --git a/viewer/public/index.html b/viewer/public/index.html
index 4f2767c..c3ff247 100644
--- a/viewer/public/index.html
+++ b/viewer/public/index.html
@@ -25,7 +25,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="mobile-web-app-capable" content="yes">
   <meta name="viewport" content="user-scalable=no,width=device-width,initial-scale=1.0">
-  <meta name="generator" content="ldgallery">
+  <meta name="generator" content="ldgallery, software distributed under the terms of the GNU Affero General Public License v3.0">
 
   <link rel="manifest" href="manifest.json">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-- 
cgit v1.2.3


From 06228f6620643ef591eceeb86eb1b10efce69ef0 Mon Sep 17 00:00:00 2001
From: pacien
Date: Fri, 25 Jun 2021 12:05:48 +0200
Subject: compiler/Input: remove duplicate assertion on input file tree

---
 compiler/src/Input.hs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/compiler/src/Input.hs b/compiler/src/Input.hs
index 48931ec..4cfabe6 100644
--- a/compiler/src/Input.hs
+++ b/compiler/src/Input.hs
@@ -1,7 +1,7 @@
 -- ldgallery - A static generator which turns a collection of tagged
 --             pictures into a searchable web gallery.
 --
--- Copyright (C) 2019-2020  Pacien TRAN-GIRARD
+-- Copyright (C) 2019-2021  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
@@ -100,9 +100,7 @@ readSidecarFile filepath =
 
 
 readInputTree :: AnchoredFSNode -> IO InputTree
-readInputTree (AnchoredFSNode _ File{}) =
-  throw $ AssertionFailed "Input directory is a file"
-readInputTree (AnchoredFSNode anchor root@Dir{}) = mkDirNode root
+readInputTree (AnchoredFSNode anchor root) = mkDirNode root
   where
     mkInputNode :: Map.Map FileName FSNode -> FSNode -> IO (Maybe InputTree)
     mkInputNode dir file@File{path} | not (isSidecar file) && not (isThumbnail file) =
-- 
cgit v1.2.3


From 7bd88b9d462903ae7753b9ef7a3613ebcd9bad45 Mon Sep 17 00:00:00 2001
From: pacien
Date: Fri, 25 Jun 2021 12:09:30 +0200
Subject: viewer/GalleryNavigation: uniquely identify viewer instances by item

This forces viewer components to be re-instantiated on item change.

GitHub: fixes #268
---
 viewer/src/views/GalleryNavigation.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/viewer/src/views/GalleryNavigation.vue b/viewer/src/views/GalleryNavigation.vue
index fd1f19a..c53df66 100644
--- a/viewer/src/views/GalleryNavigation.vue
+++ b/viewer/src/views/GalleryNavigation.vue
@@ -21,7 +21,7 @@
   <div>
     <ld-error v-if="isError" icon="folder-open" :message="$t('gallery.unknown-resource')" />
     <gallery-search v-else-if="isSearch" :path="path" />
-    <component :is="componentName" v-else :item="$galleryStore.currentItem" />
+    <component :is="componentName" v-else :key="$galleryStore.currentItem.path" :item="$galleryStore.currentItem" />
   </div>
 </template>
 
-- 
cgit v1.2.3


From 6b125a393d8ce10bfd9273c24ea1615b335abeba Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Sat, 26 Jun 2021 17:44:03 +0200
Subject: viewer/GalleryNavigation: uniquely identify viewer instances by item

Fixed error "Object is possibly 'null'" in the template
---
 viewer/src/views/GalleryNavigation.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/viewer/src/views/GalleryNavigation.vue b/viewer/src/views/GalleryNavigation.vue
index c53df66..69198f6 100644
--- a/viewer/src/views/GalleryNavigation.vue
+++ b/viewer/src/views/GalleryNavigation.vue
@@ -21,7 +21,7 @@
   <div>
     <ld-error v-if="isError" icon="folder-open" :message="$t('gallery.unknown-resource')" />
     <gallery-search v-else-if="isSearch" :path="path" />
-    <component :is="componentName" v-else :key="$galleryStore.currentItem.path" :item="$galleryStore.currentItem" />
+    <component :is="componentName" v-else :key="componentKey" :item="$galleryStore.currentItem" />
   </div>
 </template>
 
@@ -66,6 +66,10 @@ export default class GalleryNavigation extends Vue {
     return this.COMPONENT_BY_TYPE[this.$galleryStore.currentItem?.properties.type ?? ItemType.OTHER];
   }
 
+  get componentKey() {
+    return this.$galleryStore.currentItem?.path ?? "";
+  }
+
   @Watch("path")
   pathChanged() {
     this.$galleryStore.setCurrentPath(this.path);
-- 
cgit v1.2.3