Merge branch 'develop': release v2.2v2.2

5 files changed, 39 insertions, 18 deletions

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/src/FileProcessors.hs b/compiler/src/FileProcessors.hs
index 6e1738e..78e7351 100644
--- a/compiler/src/FileProcessors.hs
+++ b/compiler/src/FileProcessors.hs
@@ -100,17 +100,35 @@ type FileDescriber a =
 
 getImageResolution :: FilePath -> IO Resolution
 getImageResolution fsPath =
-  readProcess "magick" ["identify", "-format", "%w %h", firstFrame] []
-  >>= parseResolution . break (== ' ')
+  readProcess "magick"
+    [ "identify"
+    , "-ping"
+    , "-format", "%[orientation] %w %h"
+    , firstFrame
+    ] []
+  >>= parseOutput . words
+
   where
     firstFrame :: FilePath
     firstFrame = fsPath ++ "[0]"
 
+    -- Flip the dimensions when necessary according to the metadata.
+    -- ImageMagick's `-auto-orient` flag does the same, but isn't compatible
+    -- with `-ping` and causes the whole image file to be loaded.
+    parseOutput :: [String] -> IO Resolution
+    parseOutput ["RightTop", w, h] = parseResolution (h, w)
+    parseOutput ["LeftBottom", w, h] = parseResolution (h, w)
+    parseOutput [_, w, h] = parseResolution (w, h)
+    parseOutput _ = throwIO failedRead
+
     parseResolution :: (String, String) -> IO Resolution
     parseResolution (widthString, heightString) =
       case (readMaybe widthString, readMaybe heightString) of
         (Just w, Just h) -> return $ Resolution w h
-        _ -> throwIO $ ProcessingException fsPath "Unable to read image resolution."
+        _ -> throwIO failedRead
+
+    failedRead :: ProcessingException
+    failedRead = ProcessingException fsPath "Unable to read image resolution."
 
 resourceAt :: FileDescriber Resource
 resourceAt resPath fsPath = Resource resPath <$> getModificationTime fsPath
diff --git a/compiler/src/Input.hs b/compiler/src/Input.hs
index 4cfabe6..7990571 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-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
@@ -153,6 +153,4 @@ filterInputTree cond = filterNode
     filterNode :: InputTree -> InputTree
     filterNode inputFile@InputFile{} = inputFile
     filterNode inputDir@InputDir{items} =
-        filter cond items
-      & map filterNode
-      & \curatedItems -> inputDir { items = curatedItems } :: InputTree
+      inputDir { Input.items = filter cond items & map filterNode }
diff --git a/compiler/src/ItemProcessors.hs b/compiler/src/ItemProcessors.hs
index fa99316..6035477 100644
--- a/compiler/src/ItemProcessors.hs
+++ b/compiler/src/ItemProcessors.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
@@ -38,6 +38,7 @@ data Format =
   | PlainTextFormat
   | MarkdownFormat
   | PortableDocumentFormat
+  | EPUBFormat
   | VideoFormat
   | AudioFormat
   | Unknown
@@ -59,6 +60,7 @@ formatFromPath =
       ".txt" -> PlainTextFormat
       ".md" -> MarkdownFormat
       ".pdf" -> PortableDocumentFormat
+      ".epub" -> EPUBFormat
       ".wav" -> AudioFormat
       ".oga" -> AudioFormat
       ".ogg" -> AudioFormat
@@ -103,6 +105,7 @@ itemFileProcessor maxResolution =
     processorFor PlainTextFormat _ = copyResource PlainText
     processorFor MarkdownFormat _ = copyResource Markdown
     processorFor PortableDocumentFormat _ = copyResource PDF
+    processorFor EPUBFormat _ = copyResource EPUB
     processorFor VideoFormat _ = copyResource Video
     processorFor AudioFormat _ = copyResource Audio
     processorFor Unknown _ = copyResource Other
diff --git a/compiler/src/Resource.hs b/compiler/src/Resource.hs
index 804c9a1..e8ca58c 100644
--- a/compiler/src/Resource.hs
+++ b/compiler/src/Resource.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
@@ -56,7 +56,7 @@ encodingOptions :: JSON.Options
 encodingOptions = JSON.defaultOptions
   { JSON.fieldLabelModifier = map toLower
   , JSON.constructorTagModifier = map toLower
-  , JSON.sumEncoding = JSON.defaultTaggedObject
+  , JSON.sumEncoding = JSON.TaggedObject
       { JSON.tagFieldName = "type"
       , JSON.contentsFieldName = "contents"
       }
@@ -92,6 +92,7 @@ data GalleryItemProps =
   | PlainText { resource :: Resource }
   | Markdown { resource :: Resource }
   | PDF { resource :: Resource }
+  | EPUB { resource :: Resource }
   | Video { resource :: Resource }
   | Audio { resource :: Resource }
   | Other { resource :: Resource }
@@ -179,7 +180,7 @@ buildGalleryTree processItem processThumbnail tagsFromDirsConfig =
       & map (prefix tagsFromDirsConfig ++)
 
     aggregateTags :: [GalleryItem] -> [Tag]
-    aggregateTags = concatMap (\item -> tags (item::GalleryItem))
+    aggregateTags = concatMap Resource.tags
 
     maybeThumbnail :: Path -> Maybe Path -> IO (Maybe Thumbnail)
     maybeThumbnail _ Nothing = return Nothing
@@ -187,7 +188,7 @@ buildGalleryTree processItem processThumbnail tagsFromDirsConfig =
 
     mostRecentModTime :: [GalleryItem] -> Maybe ZonedTime
     mostRecentModTime =
-      maximumByMay comparingTime . map (datetime::(GalleryItem -> ZonedTime))
+      maximumByMay comparingTime . map Resource.datetime
 
     comparingTime :: ZonedTime -> ZonedTime -> Ordering
     comparingTime l r = compare (zonedTimeToUTC l) (zonedTimeToUTC r)
@@ -219,14 +220,11 @@ galleryOutputDiff resources ref =
 
     resPath :: GalleryItemProps -> Maybe Path
     resPath Directory{} = Nothing
-    resPath resourceProps =
-        Just
-      $ resourcePath
-      $ (resource :: (GalleryItemProps -> Resource)) resourceProps
+    resPath resourceProps = Just $ resourcePath $ resourceProps.resource
 
     thumbnailPaths :: [GalleryItem] -> [Path]
     thumbnailPaths =
-        map (resourcePath . (resource :: (Thumbnail -> Resource)))
+        map (\thumbnail -> resourcePath thumbnail.resource)