diff options
Diffstat (limited to 'compiler')
-rw-r--r-- | compiler/ldgallery.1.md | 3 | ||||
-rw-r--r-- | compiler/src/Config.hs | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/compiler/ldgallery.1.md b/compiler/ldgallery.1.md index 4c9c6c8..3e20562 100644 --- a/compiler/ldgallery.1.md +++ b/compiler/ldgallery.1.md | |||
@@ -115,6 +115,9 @@ tags | |||
115 | 115 | ||
116 | The gallery settings reside in a file named "gallery.yaml" located at the root of the gallery's source directory. | 116 | The gallery settings reside in a file named "gallery.yaml" located at the root of the gallery's source directory. |
117 | 117 | ||
118 | galleryTitle | ||
119 | : Title of the gallery. Defaults to "ldgallery". | ||
120 | |||
118 | includedDirectories[] | 121 | includedDirectories[] |
119 | : Glob patterns of directory names to include in the gallery. Defaults to ["*"] (matches all directory names). | 122 | : Glob patterns of directory names to include in the gallery. Defaults to ["*"] (matches all directory names). |
120 | 123 | ||
diff --git a/compiler/src/Config.hs b/compiler/src/Config.hs index 5f1806d..1bdb2b8 100644 --- a/compiler/src/Config.hs +++ b/compiler/src/Config.hs | |||
@@ -50,7 +50,8 @@ instance FromJSON TagsFromDirectoriesConfig where | |||
50 | 50 | ||
51 | 51 | ||
52 | data GalleryConfig = GalleryConfig | 52 | data GalleryConfig = GalleryConfig |
53 | { includedDirectories :: [String] | 53 | { galleryTitle :: String |
54 | , includedDirectories :: [String] | ||
54 | , excludedDirectories :: [String] | 55 | , excludedDirectories :: [String] |
55 | , includedFiles :: [String] | 56 | , includedFiles :: [String] |
56 | , excludedFiles :: [String] | 57 | , excludedFiles :: [String] |
@@ -61,7 +62,8 @@ data GalleryConfig = GalleryConfig | |||
61 | 62 | ||
62 | instance FromJSON GalleryConfig where | 63 | instance FromJSON GalleryConfig where |
63 | parseJSON = withObject "GalleryConfig" $ \v -> GalleryConfig | 64 | parseJSON = withObject "GalleryConfig" $ \v -> GalleryConfig |
64 | <$> v .:? "includedDirectories" .!= ["*"] | 65 | <$> v .:? "galleryTitle" .!= "ldgallery" |
66 | <*> v .:? "includedDirectories" .!= ["*"] | ||
65 | <*> v .:? "excludedDirectories" .!= [] | 67 | <*> v .:? "excludedDirectories" .!= [] |
66 | <*> v .:? "includedFiles" .!= ["*"] | 68 | <*> v .:? "includedFiles" .!= ["*"] |
67 | <*> v .:? "excludedFiles" .!= [] | 69 | <*> v .:? "excludedFiles" .!= [] |
@@ -75,7 +77,8 @@ readConfig = decodeYamlFile | |||
75 | 77 | ||
76 | data ViewerConfig = ViewerConfig | 78 | data ViewerConfig = ViewerConfig |
77 | { -- TODO: add viewer config keys (tag groups...) | 79 | { -- TODO: add viewer config keys (tag groups...) |
80 | galleryTitle :: String | ||
78 | } deriving (Generic, ToJSON, Show) | 81 | } deriving (Generic, ToJSON, Show) |
79 | 82 | ||
80 | viewerConfig :: GalleryConfig -> ViewerConfig | 83 | viewerConfig :: GalleryConfig -> ViewerConfig |
81 | viewerConfig _ = ViewerConfig -- TODO | 84 | viewerConfig GalleryConfig{galleryTitle} = ViewerConfig galleryTitle |