2 files changed, 20 insertions, 13 deletions

diff --git a/compiler/app/Main.hs b/compiler/app/Main.hs
index 1229e88..404de4b 100644
--- a/compiler/app/Main.hs
+++ b/compiler/app/Main.hs
@@ -24,11 +24,11 @@ import Control.Monad (when)
 import Data.Version (showVersion)
 import Data.Aeson (ToJSON)
 import System.FilePath ((</>))
-import System.Directory (canonicalizePath)
+import System.Directory (canonicalizePath, listDirectory)
 import System.Console.CmdArgs
 
 import Compiler
-import Files (readDirectory, copyTo)
+import Files (readDirectory, copyTo, remove)
 
 
 data ViewerConfig = ViewerConfig
@@ -95,12 +95,13 @@ main =
     opts <- cmdArgs options
     buildGallery opts
     when (withViewer opts) $ do
+      when (cleanOutput opts) $ cleanViewerDir (outputDir opts)
       copyViewer (outputDir opts)
       writeViewerConfig (outputDir opts </> "config.json")
 
   where
     gallerySubdir :: String
-    gallerySubdir = "gallery/"
+    gallerySubdir = "gallery"
 
     buildGallery :: Options -> IO ()
     buildGallery opts =
@@ -123,6 +124,12 @@ main =
       if withViewer opts then outputBase </> gallerySubdir else outputBase
       where outputBase = outputDir opts
 
+    cleanViewerDir :: FilePath -> IO ()
+    cleanViewerDir target =
+      listDirectory target
+      >>= return . filter (/= gallerySubdir)
+      >>= mapM_ remove . map (target </>)
+
     copyViewer :: FilePath -> IO ()
     copyViewer target =
       putStrLn "Copying viewer webapp"
@@ -131,4 +138,4 @@ main =
       >>= copyTo target
 
     writeViewerConfig :: FilePath -> IO ()
-    writeViewerConfig fileName = writeJSON fileName $ ViewerConfig gallerySubdir
+    writeViewerConfig fileName = writeJSON fileName $ ViewerConfig (gallerySubdir ++ "/")
diff --git a/compiler/src/Compiler.hs b/compiler/src/Compiler.hs
index 73ac8a4..2970102 100644
--- a/compiler/src/Compiler.hs
+++ b/compiler/src/Compiler.hs
@@ -22,6 +22,7 @@ module Compiler
   ) where
 
 
+import GHC.Generics (Generic)
 import Control.Monad (liftM2, when)
 import Data.List (any)
 import System.FilePath ((</>))
@@ -33,7 +34,7 @@ import qualified Data.Aeson as JSON
 
 import Config
 import Input (readInputTree)
-import Resource (buildGalleryTree, galleryCleanupResourceDir)
+import Resource (GalleryItem, buildGalleryTree, galleryCleanupResourceDir)
 import Files
   ( FileName
   , FSNode(..)
@@ -53,9 +54,6 @@ defaultGalleryConf = "gallery.yaml"
 indexFile :: String
 indexFile = "index.json"
 
-viewerConfFile :: String
-viewerConfFile = "viewer.json"
-
 itemsDir :: String
 itemsDir = "items"
 
@@ -63,6 +61,12 @@ thumbnailsDir :: String
 thumbnailsDir = "thumbnails"
 
 
+data GalleryIndex = GalleryIndex
+  { properties :: ViewerConfig
+  , tree :: GalleryItem
+  } deriving (Generic, Show, ToJSON)
+
+
 writeJSON :: ToJSON a => FileName -> a -> IO ()
 writeJSON outputPath object =
   do
@@ -117,17 +121,13 @@ compileGallery configPath inputDirPath outputDirPath excludedDirs rebuildAll cle
     resources <- galleryBuilder inputTree
 
     when cleanOutput $ galleryCleanupResourceDir resources outputDirPath
-    writeJSON outputIndex resources
-    writeJSON outputViewerConf $ viewerConfig config
+    writeJSON (outputDirPath </> indexFile) $ GalleryIndex (viewerConfig config) resources
 
   where
     inputGalleryConf :: FilePath -> FilePath
     inputGalleryConf "" = inputDirPath </> defaultGalleryConf
     inputGalleryConf file = file
 
-    outputIndex = outputDirPath </> indexFile
-    outputViewerConf = outputDirPath </> viewerConfFile
-
     itemProcessor config cache =
       itemFileProcessor
         (pictureMaxResolution config) cache