compiler: flatten gallery config

GitHub: closes #129

4 files changed, 56 insertions, 79 deletions

diff --git a/ldgallery.1.md b/compiler/ldgallery.1.md
index e891345..5524409 100644
--- a/ldgallery.1.md
+++ b/compiler/ldgallery.1.md
@@ -110,59 +110,38 @@ tags
 
 The gallery settings reside in a file named "gallery.yaml" located at the root of the gallery's source directory.
 
-compiler.includedDirectories[]
-: Glob patterns of directory names to include in the gallery.
-  Defaults to ["*"] (matches all directory names).
+includedDirectories[]
+: Glob patterns of directory names to include in the gallery.  Defaults to ["*"] (matches all directory names).
 
-compiler.excludedDirectories[]
-: Glob patterns of directory names to exclude from the gallery.
-  Defaults to [] (none).
+excludedDirectories[]
+: Glob patterns of directory names to exclude from the gallery.  Defaults to [] (none).
 
-compiler.includedFiles[]
-: Glob patterns of file names to include in the gallery.
-  Defaults to ["*"] (matches all file names).
+includedFiles[]
+: Glob patterns of file names to include in the gallery.  Defaults to ["*"] (matches all file names).
 
-compiler.excludedFiles[]
-: Glob patterns of file names to exclude from the gallery.
-  Defaults to [] (none).
+excludedFiles[]
+: Glob patterns of file names to exclude from the gallery.  Defaults to [] (none).
 
-compiler.tagsFromDirectories.fromParents
+tagsFromDirectories.fromParents
 : Automatically generate tags from the name of parent directories,
   looking up in the hierarchy as far as indicated by this parameter.
   Defaults to 0 (do not generate tags from parent directories).
 
-compiler.tagsFromDirectories.prefix
+tagsFromDirectories.prefix
 : Prefix to use for tags automatically generated from the parent directories' names.
 
-compiler.thumbnailMaxResolution.width
+thumbnailMaxResolution.width
 : Maximum width in pixels of the item thumbnails, 400 by default.
 
-compiler.thumbnailMaxResolution.height
+thumbnailMaxResolution.height
 : Maximum height in pixels of the item thumbnails, 300 by default.
 
-compiler.pictureMaxResolution.width
+pictureMaxResolution.width
 : Maximum width in pixels of the picture items, unlimited by default.
 
-compiler.pictureMaxResolution.height
+pictureMaxResolution.height
 : Maximum height in pixels of the picture items, unlimited by default.
 
-viewer.defaultSearchQuery [TODO]
-: Default search query string.
-
-viewer.defaultSortOrder [TODO]
-: Default sort order ("alphanumeric", "reverse-alphanumeric", "date", "reverse-date").
-  Defaults to "date".
-
-viewer.tagGroups[].tag [TODO]
-: Tag prefix defining the tag group.
-
-viewer.tagGroups[].colour [TODO]
-: Colour associated to the tag group.
-
-viewer.hiddenTags [TODO]
-: List of tags to hide by default.
-  Items bearing one of those tags will not be displayed until they are being explicitly searched for.
-
 
 # SEE ALSO
 
diff --git a/compiler/src/Compiler.hs b/compiler/src/Compiler.hs
index bb0ee97..73ac8a4 100644
--- a/compiler/src/Compiler.hs
+++ b/compiler/src/Compiler.hs
@@ -70,7 +70,7 @@ writeJSON outputPath object =
     ensureParentDir JSON.encodeFile outputPath object
 
 
-galleryDirFilter :: CompilerConfig -> [FilePath] -> FSNode -> Bool
+galleryDirFilter :: GalleryConfig -> [FilePath] -> FSNode -> Bool
 galleryDirFilter config excludedCanonicalDirs =
       (not . isHidden)
   &&& (not . isExcludedDir)
@@ -102,8 +102,7 @@ galleryDirFilter config excludedCanonicalDirs =
 compileGallery :: FilePath -> FilePath -> FilePath -> [FilePath] -> Bool -> Bool -> IO ()
 compileGallery configPath inputDirPath outputDirPath excludedDirs rebuildAll cleanOutput =
   do
-    fullConfig <- readConfig $ inputGalleryConf configPath
-    let config = compiler fullConfig
+    config <- readConfig $ inputGalleryConf configPath
 
     inputDir <- readDirectory inputDirPath
     excludedCanonicalDirs <- mapM canonicalizePath excludedDirs
@@ -119,7 +118,7 @@ compileGallery configPath inputDirPath outputDirPath excludedDirs rebuildAll cle
 
     when cleanOutput $ galleryCleanupResourceDir resources outputDirPath
     writeJSON outputIndex resources
-    writeJSON outputViewerConf $ viewer fullConfig
+    writeJSON outputViewerConf $ viewerConfig config
 
   where
     inputGalleryConf :: FilePath -> FilePath
diff --git a/compiler/src/Config.hs b/compiler/src/Config.hs
index bf5a28e..5f1806d 100644
--- a/compiler/src/Config.hs
+++ b/compiler/src/Config.hs
@@ -17,11 +17,10 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 module Config
-  ( GalleryConfig(..)
-  , CompilerConfig(..)
+  ( GalleryConfig(..), readConfig
+  , ViewerConfig(..), viewerConfig
   , TagsFromDirectoriesConfig(..)
   , Resolution(..)
-  , readConfig
   ) where
 
 
@@ -39,7 +38,18 @@ data Resolution = Resolution
   } deriving (Generic, Show, ToJSON, FromJSON)
 
 
-data CompilerConfig = CompilerConfig
+data TagsFromDirectoriesConfig = TagsFromDirectoriesConfig
+  { fromParents :: Int
+  , prefix :: String
+  } deriving (Generic, Show)
+
+instance FromJSON TagsFromDirectoriesConfig where
+  parseJSON = withObject "TagsFromDirectoriesConfig" $ \v -> TagsFromDirectoriesConfig
+    <$> v .:? "fromParents" .!= 0
+    <*> v .:? "prefix" .!= ""
+
+
+data GalleryConfig = GalleryConfig
   { includedDirectories :: [String]
   , excludedDirectories :: [String]
   , includedFiles :: [String]
@@ -49,8 +59,8 @@ data CompilerConfig = CompilerConfig
   , pictureMaxResolution :: Maybe Resolution
   } deriving (Generic, Show)
 
-instance FromJSON CompilerConfig where
-  parseJSON = withObject "CompilerConfig" $ \v -> CompilerConfig
+instance FromJSON GalleryConfig where
+  parseJSON = withObject "GalleryConfig" $ \v -> GalleryConfig
     <$> v .:? "includedDirectories" .!= ["*"]
     <*> v .:? "excludedDirectories" .!= []
     <*> v .:? "includedFiles" .!= ["*"]
@@ -59,22 +69,13 @@ instance FromJSON CompilerConfig where
     <*> v .:? "thumbnailMaxResolution" .!= (Resolution 400 300)
     <*> v .:? "pictureMaxResolution"
 
-
-data TagsFromDirectoriesConfig = TagsFromDirectoriesConfig
-  { fromParents :: Int
-  , prefix :: String
-  } deriving (Generic, Show)
-
-instance FromJSON TagsFromDirectoriesConfig where
-  parseJSON = withObject "TagsFromDirectoriesConfig" $ \v -> TagsFromDirectoriesConfig
-    <$> v .:? "fromParents" .!= 0
-    <*> v .:? "prefix" .!= ""
+readConfig :: FileName -> IO GalleryConfig
+readConfig = decodeYamlFile
 
 
-data GalleryConfig = GalleryConfig
-  { compiler :: CompilerConfig
-  , viewer :: JSON.Object
-  } deriving (Generic, FromJSON, Show)
+data ViewerConfig = ViewerConfig
+  { -- TODO: add viewer config keys (tag groups...)
+  } deriving (Generic, ToJSON, Show)
 
-readConfig :: FileName -> IO GalleryConfig
-readConfig = decodeYamlFile
+viewerConfig :: GalleryConfig -> ViewerConfig
+viewerConfig _ = ViewerConfig -- TODO
diff --git a/example/src/gallery.yaml b/example/src/gallery.yaml
index 3408571..b25b657 100644
--- a/example/src/gallery.yaml
+++ b/example/src/gallery.yaml
@@ -1,24 +1,22 @@
-compiler:
-  #includedDirectories: ["*"]
-  #excludedDirectories: []
+# ldgallery example gallery configuration file
 
-  includedFiles:
-  - "*.jpg"
-
-  #excludedFiles:
-  #- "*.md"
+#includedDirectories: ["*"]
+#excludedDirectories: []
 
-  tagsFromDirectories:
-    fromParents: 0 # default
-    prefix: ""     # default
+includedFiles:
+  - "*.jpg"
 
-  thumbnailMaxResolution:
-    width: 400  # default
-    height: 300 # default
+#excludedFiles:
+#  - "*.md"
 
-  pictureMaxResolution:
-    width: 1024
-    height: 768
+tagsFromDirectories:
+  fromParents: 0 # default
+  prefix: ""     # default