diff options
Diffstat (limited to 'compiler/src/Config.hs')
-rw-r--r-- | compiler/src/Config.hs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/src/Config.hs b/compiler/src/Config.hs index 1bdb2b8..8796c3c 100644 --- a/compiler/src/Config.hs +++ b/compiler/src/Config.hs | |||
@@ -55,6 +55,8 @@ data GalleryConfig = GalleryConfig | |||
55 | , excludedDirectories :: [String] | 55 | , excludedDirectories :: [String] |
56 | , includedFiles :: [String] | 56 | , includedFiles :: [String] |
57 | , excludedFiles :: [String] | 57 | , excludedFiles :: [String] |
58 | , includedTags :: [String] | ||
59 | , excludedTags :: [String] | ||
58 | , tagsFromDirectories :: TagsFromDirectoriesConfig | 60 | , tagsFromDirectories :: TagsFromDirectoriesConfig |
59 | , thumbnailMaxResolution :: Resolution | 61 | , thumbnailMaxResolution :: Resolution |
60 | , pictureMaxResolution :: Maybe Resolution | 62 | , pictureMaxResolution :: Maybe Resolution |
@@ -67,6 +69,8 @@ instance FromJSON GalleryConfig where | |||
67 | <*> v .:? "excludedDirectories" .!= [] | 69 | <*> v .:? "excludedDirectories" .!= [] |
68 | <*> v .:? "includedFiles" .!= ["*"] | 70 | <*> v .:? "includedFiles" .!= ["*"] |
69 | <*> v .:? "excludedFiles" .!= [] | 71 | <*> v .:? "excludedFiles" .!= [] |
72 | <*> v .:? "includedTags" .!= ["*"] | ||
73 | <*> v .:? "excludedTags" .!= [] | ||
70 | <*> v .:? "tagsFromDirectories" .!= (TagsFromDirectoriesConfig 0 "") | 74 | <*> v .:? "tagsFromDirectories" .!= (TagsFromDirectoriesConfig 0 "") |
71 | <*> v .:? "thumbnailMaxResolution" .!= (Resolution 400 300) | 75 | <*> v .:? "thumbnailMaxResolution" .!= (Resolution 400 300) |
72 | <*> v .:? "pictureMaxResolution" | 76 | <*> v .:? "pictureMaxResolution" |