diff options
author | pacien | 2022-09-04 18:18:27 +0200 |
---|---|---|
committer | pacien | 2022-09-04 18:18:27 +0200 |
commit | 11bbbae2850b9c45da697a8ed9626495a50a38c0 (patch) | |
tree | ff2713118f8b45d36905bfea2933f08d8e70066d /compiler/src/Compiler.hs | |
parent | e93f7b1eb84c083d67567115284c0002a3a7d5fc (diff) | |
parent | 8349be992b46b77dee921f484cfbff8b758ff756 (diff) | |
download | ldgallery-2.1.tar.gz |
Merge branch 'develop': release v2.1v2.1
GitHub: related to #315
Diffstat (limited to 'compiler/src/Compiler.hs')
-rw-r--r-- | compiler/src/Compiler.hs | 6 |
1 files changed, 3 insertions, 3 deletions
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 | |||
147 | cachedIndex <- loadCachedIndex galleryIndexPath | 147 | cachedIndex <- loadCachedIndex galleryIndexPath |
148 | let cache = mkCache cachedIndex | 148 | let cache = mkCache cachedIndex |
149 | 149 | ||
150 | let itemProc = itemProcessor config (cache Resource.properties) | 150 | let itemProc = itemProcessor config (cache $ return . Resource.properties) |
151 | let thumbnailProc = thumbnailProcessor config (cache Resource.thumbnail) | 151 | let thumbnailProc = thumbnailProcessor config (cache $ fmap return . Resource.thumbnail) |
152 | let galleryBuilder = buildGalleryTree itemProc thumbnailProc (tagsFromDirectories config) | 152 | let galleryBuilder = buildGalleryTree itemProc thumbnailProc (tagsFromDirectories config) |
153 | resources <- galleryBuilder curatedInputTree | 153 | resources <- galleryBuilder curatedInputTree |
154 | 154 | ||
@@ -170,7 +170,7 @@ compileGallery configPath inputDirPath outputDirPath outputIndexPath excludedDir | |||
170 | then return Nothing | 170 | then return Nothing |
171 | else loadGalleryIndex galleryIndexPath | 171 | else loadGalleryIndex galleryIndexPath |
172 | 172 | ||
173 | mkCache :: Maybe GalleryIndex -> (GalleryItem -> a) -> Cache a | 173 | mkCache :: Maybe GalleryIndex -> (GalleryItem -> Maybe a) -> Cache a |
174 | mkCache refGalleryIndex = | 174 | mkCache refGalleryIndex = |
175 | if rebuildAll | 175 | if rebuildAll |
176 | then const noCache | 176 | then const noCache |