From 0fddc74a3f9add47841124b4d77b097f4646d14f Mon Sep 17 00:00:00 2001
From: pacien
Date: Sun, 30 Oct 2022 01:05:45 +0200
Subject: compiler: fix support for non-utf8 terminals

The compiler echoes the names of the files being processed.
Those file names may contain UTF-8 characters.
However, some consoles may not support those.
This is notably the case of the Windows CMD or on Linux with the legacy
C locale. This caused the following error:

  ldgallery: <stdout>: commitBuffer: invalid argument (invalid character)

This patch adds automatic transliteration when a non-UTF8 terminal is
detected, so that neither the compiler or the terminal crash due to UTF8
characters.

GitHub: closes #341
---
 changelog.md          | 1 +
 compiler/app/Main.hs  | 5 +++--
 compiler/package.yaml | 3 ++-
 flake.nix             | 2 --
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/changelog.md b/changelog.md
index 0cf3194..9afc27a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -10,6 +10,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/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 = ":";
-- 
cgit v1.2.3