diff options
Diffstat (limited to 'compiler/src/Config.hs')
-rw-r--r-- | compiler/src/Config.hs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/compiler/src/Config.hs b/compiler/src/Config.hs index 8796c3c..0ae0fa1 100644 --- a/compiler/src/Config.hs +++ b/compiler/src/Config.hs | |||
@@ -57,6 +57,7 @@ data GalleryConfig = GalleryConfig | |||
57 | , excludedFiles :: [String] | 57 | , excludedFiles :: [String] |
58 | , includedTags :: [String] | 58 | , includedTags :: [String] |
59 | , excludedTags :: [String] | 59 | , excludedTags :: [String] |
60 | , tagCategories :: [String] | ||
60 | , tagsFromDirectories :: TagsFromDirectoriesConfig | 61 | , tagsFromDirectories :: TagsFromDirectoriesConfig |
61 | , thumbnailMaxResolution :: Resolution | 62 | , thumbnailMaxResolution :: Resolution |
62 | , pictureMaxResolution :: Maybe Resolution | 63 | , pictureMaxResolution :: Maybe Resolution |
@@ -71,6 +72,7 @@ instance FromJSON GalleryConfig where | |||
71 | <*> v .:? "excludedFiles" .!= [] | 72 | <*> v .:? "excludedFiles" .!= [] |
72 | <*> v .:? "includedTags" .!= ["*"] | 73 | <*> v .:? "includedTags" .!= ["*"] |
73 | <*> v .:? "excludedTags" .!= [] | 74 | <*> v .:? "excludedTags" .!= [] |
75 | <*> v .:? "tagCategories" .!= [] | ||
74 | <*> v .:? "tagsFromDirectories" .!= (TagsFromDirectoriesConfig 0 "") | 76 | <*> v .:? "tagsFromDirectories" .!= (TagsFromDirectoriesConfig 0 "") |
75 | <*> v .:? "thumbnailMaxResolution" .!= (Resolution 400 300) | 77 | <*> v .:? "thumbnailMaxResolution" .!= (Resolution 400 300) |
76 | <*> v .:? "pictureMaxResolution" | 78 | <*> v .:? "pictureMaxResolution" |
@@ -80,9 +82,9 @@ readConfig = decodeYamlFile | |||
80 | 82 | ||
81 | 83 | ||
82 | data ViewerConfig = ViewerConfig | 84 | data ViewerConfig = ViewerConfig |
83 | { -- TODO: add viewer config keys (tag groups...) | 85 | { galleryTitle :: String |
84 | galleryTitle :: String | 86 | , tagCategories :: [String] |
85 | } deriving (Generic, ToJSON, Show) | 87 | } deriving (Generic, ToJSON, Show) |
86 | 88 | ||
87 | viewerConfig :: GalleryConfig -> ViewerConfig | 89 | viewerConfig :: GalleryConfig -> ViewerConfig |
88 | viewerConfig GalleryConfig{galleryTitle} = ViewerConfig galleryTitle | 90 | viewerConfig GalleryConfig{galleryTitle, tagCategories} = ViewerConfig galleryTitle tagCategories |