15 files changed, 80 insertions, 44 deletions

diff --git a/.travis.yml b/.travis.yml
index e9f8948..98a00fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,30 +2,52 @@ language: generic
 
 jobs:
   include:
-  - name: viewer
-    language: node_js
-    node_js: 12
+  - name: release-linux
+    language: generic
+
+    deploy:
+      provider: releases
+      edge: true
+      api_key:
+        secure: zRJV96jl3zchT88YAtT6irCXgm96qVcIokVmCHrzcAXsRHgTHQURKcdpPzFdZQnNkxwfS1akA3fW5icr+U6WZIxIe56sHYEaBg7VXR1RiGW/qNOAhSvbJGva75iUllTiELa2FL2gEb8bNhVOy3+bQr5Z7RMeHFiC4FFmbMvaQhd5ss3yR5+bqKufEuJPDpFap93XHUoczXH+lXp1v90Cia1gskHsSl+YgfGWQAc89yOxETwFOSqr3CScZGV6oJpGM2rsflN5arFS/8JqDwuemttfrt74wDdKR4Mk94tcqXqMrledUsXR1NEjWAEWW6QMj05ztZ76TkT2hKpG+WVmUTaJjNKS+RJnf4WKzv1vo2EHZuAuPvwR21NGVYTxvV4o3Zvs4YODGXiUxQgeF5LFA3jbZw9ODyloStUV7zIPqzL7qJEIehnMtkjo2JPav5ORz6B7GwVrDC4LJHn95on3/3Voo3mPeyepoz1gFoh3iovTKAc+IXQXGOhT7cATP9DAWLO/Epct7hWPCEflm+oSS4rNiVbMW/61O3yIpxgkJ/oTsixLk6LOhWNdr2hfP95nAtD+It7LSsJABmWJ0FVO9RtQC7fLmEPaoGdZIdeRk/0yig9vA78Y+q46B6LBalmZO+0V60rdLdrnggJsyt3DZKM/4Z+QUwe494NodE7hU9U=
+      draft: true
+      on:
+        repo: pacien/ldgallery
+        branch:
+        - master
+        - staging
+      overwrite: true
+      skip_cleanup: true
+      file:
+      - viewer.tar.gz
+
     cache:
       directories:
       - viewer/node_modules
-    install:
-    - cd viewer
-    - npm install
-    script:
-    - npm run lint
-    - npm run build
+      - "$HOME/.stack"
 
-  - name: compiler
-    language: haskell
-    cache:
-      directories:
-      - $HOME/.stack
     before_install:
+    - nvm install 12
     - mkdir -p ~/.local/bin
     - export PATH=$HOME/.local/bin:$PATH
-    - travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
+    - travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz
+      | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
+
     install:
+    - cd viewer
+    - npm install
+    - cd ..
     - cd compiler
     - stack setup --no-terminal
+    - cd ..
+
     script:
+    - cd viewer
+    - npm run lint
+    - npm run build
+    - cd ..
+    - tar -czvf viewer.tar.gz viewer/dist
+    - cp -r viewer/dist compiler/data/viewer
+    - cd compiler
     - stack build --no-terminal
+    - cd ..
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
diff --git a/design-notes.md b/design-notes.md
index d59f511..0d7b5c1 100644
--- a/design-notes.md
+++ b/design-notes.md
@@ -234,6 +234,6 @@ By default, the content is rendered in the same ordered as listed in `index.json
 
 Items other than directories are displayed by this view, making use of most of the screen space to render the element.
 
-This view should as well display the title, description, date, tags and other information associated to the item.  Tags in particular are displayed in a grouped manner as determined in `viewer.json`.
+This view should as well display the title, description, date, tags and other information associated to the item.  Tags in particular are displayed in a grouped manner as determined in `index.json`.
 
 It should be possible to navigate between items of the same directory as the current one through a thumbnail reel and previous/next links.
diff --git a/example/readme.md b/example/readme.md
index 809ae68..2c03260 100644
--- a/example/readme.md
+++ b/example/readme.md
@@ -8,16 +8,16 @@ Content
 -------