Merge pull request #346 from ldgallery/p_compiler_logging

compiler: fix support for non-utf8 terminals, add more steps prints

7 files changed, 16 insertions, 11 deletions

diff --git a/changelog.md b/changelog.md
index 07a6d3a..66de4b9 100644
--- a/changelog.md
+++ b/changelog.md
@@ -11,6 +11,7 @@ release. Releases are tracked and referred to using git tags.
 - Bug fixes:
   - compiler: fix detection of dimensions of EXIF-rotated pictures.
     Rebuild the gallery with `--rebuild-all` to purge erroneous cached data.
+  - compiler: fix support for non-UTF8 terminals.
   - viewer: fix theme quirks (line spacing, icon colours).
   - viewer: fix ghost keyboard hints when the search panel is closed.
 
diff --git a/compiler/app/Main.hs b/compiler/app/Main.hs
index 3e6f254..a9630ce 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-2021  Pacien TRAN-GIRARD
+-- Copyright (C) 2019-2022  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
@@ -28,6 +28,7 @@ import Data.Aeson (ToJSON)
 import System.FilePath ((</>))
 import System.Directory (canonicalizePath, listDirectory)
 import System.Console.CmdArgs
+import Main.Utf8 (withUtf8)
 
 import Compiler
 import Files (readDirectory, copyTo, remove)
@@ -103,7 +104,7 @@ options = Options
 
 main :: IO ()
 main =
-  do
+  withUtf8 $ do
     opts <- cmdArgs options
     buildGallery opts
     deployViewer opts
diff --git a/compiler/package.yaml b/compiler/package.yaml
index 7bd86e9..0c07efe 100644
--- a/compiler/package.yaml
+++ b/compiler/package.yaml
@@ -4,7 +4,7 @@ homepage:            https://ldgallery.pacien.org
 github:              "pacien/ldgallery"
 license:             AGPL-3
 author:              "Pacien TRAN-GIRARD, Guillaume FOUET"
-copyright:           "2019-2021 Pacien TRAN-GIRARD, Guillaume FOUET"
+copyright:           "2019-2022 Pacien TRAN-GIRARD, Guillaume FOUET"
 
 extra-source-files:
 - readme.md
@@ -29,6 +29,7 @@ dependencies:
 - safe
 - time
 - process
+- with-utf8
 
 default-extensions:
 - DuplicateRecordFields
diff --git a/compiler/src/Compiler.hs b/compiler/src/Compiler.hs
index 4111f02..d92d8e9 100644
--- a/compiler/src/Compiler.hs
+++ b/compiler/src/Compiler.hs
@@ -85,7 +85,8 @@ loadGalleryIndex path =
   doesFileExist path >>= bool (return Nothing) decodeIndex
   where
     decodeIndex =
-      JSON.eitherDecodeFileStrict path
+      putStrLn ("Loading previous index:\t" ++ path)
+      >>  JSON.eitherDecodeFileStrict path
       >>= either (\err -> warn err >> return Nothing) (return . Just)
     warn = putStrLn . ("Warning:\tUnable to reuse existing index as cache: " ++)
 
@@ -136,10 +137,13 @@ compileGallery configPath inputDirPath outputDirPath outputIndexPath excludedDir
   do
     config <- readConfig $ inputGalleryConf configPath
 
+    putStrLn "Inventorying input files"
     inputDir <- readDirectory inputDirPath
     excludedCanonicalDirs <- mapM canonicalizePath excludedDirs
+
     let sourceFilter = galleryDirFilter config excludedCanonicalDirs
     let sourceTree = filterDir sourceFilter inputDir
+    putStrLn "Reading input metadata"
     inputTree <- readInputTree sourceTree
     let curatedInputTree = filterInputTree (inputTreeFilter config) inputTree
 
diff --git a/compiler/stack.yaml b/compiler/stack.yaml
index 67e823b..b75c56f 100644
--- a/compiler/stack.yaml
+++ b/compiler/stack.yaml
@@ -17,7 +17,7 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver: lts-16.19
+resolver: lts-19.30
 
 
 # User packages to be built.
diff --git a/compiler/stack.yaml.lock b/compiler/stack.yaml.lock
index 93f79d9..dc48671 100644
--- a/compiler/stack.yaml.lock
+++ b/compiler/stack.yaml.lock
@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    size: 532177
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/19.yaml
-    sha256: d2b828ecf50386841d0c5700b58d38566992e10d63a062af497ab29ab031faa1
-  original: lts-16.19
+    sha256: 9a74d76d250a455d9cd11e74f157e087787fa9aa3c4264e69c94703d1e71aede
+    size: 619200
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/30.yaml
+  original: lts-19.30
diff --git a/flake.nix b/flake.nix
index 688601c..93d4f2e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -123,8 +123,6 @@
         src = ./example;
         nativeBuildInputs = [ ldgallery ];
         buildPhase = ''
-          # Need UTF-8: https://github.com/ldgallery/ldgallery/issues/341
-          export LC_ALL=C.UTF-8
           ldgallery --input-dir src --output-dir $out --with-viewer
         '';
         installPhase = ":";