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

GitHub: related to #315

6 files changed, 17 insertions, 15 deletions

diff --git a/compiler/src/Caching.hs b/compiler/src/Caching.hs
index c2b5a43..1a8b710 100644
--- a/compiler/src/Caching.hs
+++ b/compiler/src/Caching.hs
@@ -53,7 +53,7 @@ buildItemCache cachedItems = lookupCache
     cachedMap = Map.fromList (map withKey cachedItemList)
     lookupCache path = Map.lookup (webPath path) cachedMap
 
-useCached :: ItemCache -> (GalleryItem -> a) -> Cache a
+useCached :: ItemCache -> (GalleryItem -> Maybe a) -> Cache a
 useCached cache propGetter processor itemPath resPath inputFsPath outputFsPath =
   do
     isDir <- doesDirectoryExist outputFsPath
@@ -63,7 +63,7 @@ useCached cache propGetter processor itemPath resPath inputFsPath outputFsPath =
     if fileExists then
       do
         needUpdate <- isOutdated True inputFsPath outputFsPath
-        case (needUpdate, cache itemPath) of
+        case (needUpdate, cache itemPath >>= propGetter) of
           (False, Just props) -> fromCache props
           _ -> update
     else
@@ -73,4 +73,4 @@ useCached cache propGetter processor itemPath resPath inputFsPath outputFsPath =
     update = processor itemPath resPath inputFsPath outputFsPath
     fromCache props =
       putStrLn ("From cache:\t" ++ outputFsPath)
-      >> return (propGetter props)
+      >> return props
diff --git a/compiler/src/Compiler.hs b/compiler/src/Compiler.hs
index 1ec55c5..4111f02 100644
--- a/compiler/src/Compiler.hs
+++ b/compiler/src/Compiler.hs
@@ -147,8 +147,8 @@ compileGallery configPath inputDirPath outputDirPath outputIndexPath excludedDir
     cachedIndex <- loadCachedIndex galleryIndexPath
     let cache = mkCache cachedIndex
 
-    let itemProc = itemProcessor config (cache Resource.properties)
-    let thumbnailProc = thumbnailProcessor config (cache Resource.thumbnail)
+    let itemProc = itemProcessor config (cache $ return . Resource.properties)
+    let thumbnailProc = thumbnailProcessor config (cache $ fmap return . Resource.thumbnail)
     let galleryBuilder = buildGalleryTree itemProc thumbnailProc (tagsFromDirectories config)
     resources <- galleryBuilder curatedInputTree
 
@@ -170,7 +170,7 @@ compileGallery configPath inputDirPath outputDirPath outputIndexPath excludedDir
         then return Nothing
         else loadGalleryIndex galleryIndexPath
 
-    mkCache :: Maybe GalleryIndex -> (GalleryItem -> a) -> Cache a
+    mkCache :: Maybe GalleryIndex -> (GalleryItem -> Maybe a) -> Cache a
     mkCache refGalleryIndex =
       if rebuildAll
         then const noCache
diff --git a/compiler/src/FileProcessors.hs b/compiler/src/FileProcessors.hs
index 5c4e1c8..6e1738e 100644
--- a/compiler/src/FileProcessors.hs
+++ b/compiler/src/FileProcessors.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-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
@@ -79,7 +79,7 @@ copyFileProcessor inputPath outputPath =
 
 resizePictureUpTo :: Resolution -> FileTransformer
 resizePictureUpTo maxResolution inputPath outputPath =
-  putStrLn ("Generating:\t" ++ outputPath)
+  putStrLn ("Processing:\t" ++ outputPath)
   >> ensureParentDir (flip resize) outputPath inputPath
   where
     maxSize :: Resolution -> String
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) =
diff --git a/compiler/src/ItemProcessors.hs b/compiler/src/ItemProcessors.hs
index f967954..fa99316 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-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
@@ -36,6 +36,7 @@ import Files
 data Format =
     PictureFormat
   | PlainTextFormat
+  | MarkdownFormat
   | PortableDocumentFormat
   | VideoFormat
   | AudioFormat
@@ -54,8 +55,9 @@ formatFromPath =
       ".tiff" -> PictureFormat
       ".hdr" -> PictureFormat
       ".gif" -> PictureFormat
+      ".webp" -> PictureFormat
       ".txt" -> PlainTextFormat
-      ".md" -> PlainTextFormat -- TODO: handle markdown separately
+      ".md" -> MarkdownFormat
       ".pdf" -> PortableDocumentFormat
       ".wav" -> AudioFormat
       ".oga" -> AudioFormat
@@ -99,6 +101,7 @@ itemFileProcessor maxResolution =
     processorFor PictureFormat Nothing =
       transformThenDescribe copyFileProcessor getPictureProps
     processorFor PlainTextFormat _ = copyResource PlainText
+    processorFor MarkdownFormat _ = copyResource Markdown
     processorFor PortableDocumentFormat _ = copyResource PDF
     processorFor VideoFormat _ = copyResource Video
     processorFor AudioFormat _ = copyResource Audio
diff --git a/compiler/src/Resource.hs b/compiler/src/Resource.hs
index f59eed6..804c9a1 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-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
@@ -90,6 +90,7 @@ data GalleryItemProps =
     { resource :: Resource
     , resolution :: Resolution }
   | PlainText { resource :: Resource }
+  | Markdown { resource :: Resource }
   | PDF { resource :: Resource }
   | Video { resource :: Resource }
   | Audio { resource :: Resource }