1 files changed, 24 insertions, 25 deletions

diff --git a/compiler/app/Main.hs b/compiler/app/Main.hs
index 48e5644..3e6f254 100644
--- a/compiler/app/Main.hs
+++ b/compiler/app/Main.hs
@@ -1,7 +1,7 @@
 -- ldgallery - A static generator which turns a collection of tagged
 --             pictures into a searchable web gallery.
 --
--- Copyright (C) 2019-2020  Pacien TRAN-GIRARD
+-- Copyright (C) 2019-2021  Pacien TRAN-GIRARD
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU Affero General Public License as
@@ -19,8 +19,9 @@
 module Main where
 
 import GHC.Generics (Generic)
-import Paths_ldgallery_compiler (version, getDataFileName)
+import Paths_ldgallery_compiler (version)
 import Control.Monad (when)
+import Data.Functor ((<&>))
 import Data.Maybe (isJust)
 import Data.Version (showVersion)
 import Data.Aeson (ToJSON)
@@ -30,9 +31,9 @@ import System.Console.CmdArgs
 
 import Compiler
 import Files (readDirectory, copyTo, remove)
+import ViewerDist (viewerDistPath)
 
-
-data ViewerConfig = ViewerConfig
+newtype ViewerConfig = ViewerConfig
   { galleryRoot :: String
   } deriving (Generic, Show, ToJSON)
 
@@ -42,7 +43,7 @@ data Options = Options
   , outputDir :: FilePath
   , outputIndex :: FilePath
   , galleryConfig :: FilePath
-  , rebuilAll :: Bool
+  , rebuildAll :: Bool
   , cleanOutput :: Bool
   , withViewer :: Maybe FilePath
   } deriving (Show, Data, Typeable)
@@ -73,7 +74,7 @@ options = Options
       &= name "gallery-config"
       &= explicit
       &= help "Gallery configuration file (default=<input-dir>/gallery.yaml)"
-  , rebuilAll = False
+  , rebuildAll = False
       &= name "r"
       &= name "rebuild-all"
       &= explicit
@@ -92,7 +93,8 @@ options = Options
       &= help "Deploy either the bundled or the given static web viewer to the output directory"
   }
 
-  &= summary ("ldgallery v" ++ (showVersion version) ++ " - a static web gallery generator with tags")
+  &= summary ("ldgallery v" ++ showVersion version ++ " - a static web gallery generator with tags")
+  &= details ["This software is distributed under the terms of the GNU Affero General Public License v3.0."]
   &= program "ldgallery"
   &= help "Compile a gallery"
   &= helpArg [explicit, name "h", name "help"]
@@ -104,10 +106,7 @@ main =
   do
     opts <- cmdArgs options
     buildGallery opts
-
-    when (isJust $ withViewer opts) $ do
-      viewerDist <- viewerDistPath $ withViewer opts
-      deployViewer viewerDist opts
+    deployViewer opts
 
   where
     gallerySubdir :: String
@@ -116,11 +115,6 @@ main =
     viewerConfig :: ViewerConfig
     viewerConfig = ViewerConfig (gallerySubdir ++ "/")
 
-    viewerDistPath :: Maybe FilePath -> IO FilePath
-    viewerDistPath (Just "") = getDataFileName "viewer"
-    viewerDistPath (Just dist) = return dist
-    viewerDistPath Nothing = fail "No viewer distribution"
-
     buildGallery :: Options -> IO ()
     buildGallery opts =
       checkDistinctPaths (inputDir opts) (outputDir opts)
@@ -130,7 +124,7 @@ main =
             (galleryOutputDir opts)
             (outputIndex opts)
             [outputDir opts]
-            (rebuilAll opts)
+            (rebuildAll opts)
             (cleanOutput opts)
       where
         checkDistinctPaths :: FilePath -> FilePath -> IO ()
@@ -144,21 +138,26 @@ main =
           | isJust withViewer = outputDir </> gallerySubdir
           | otherwise = outputDir
 
-    deployViewer :: FilePath -> Options -> IO ()
-    deployViewer distPath Options{outputDir, cleanOutput} =
-      (when cleanOutput $ cleanViewerDir outputDir)
-      >> copyViewer distPath outputDir
+    deployViewer :: Options -> IO ()
+    deployViewer Options{withViewer = Nothing} = pure ()
+    deployViewer Options{withViewer = Just viewerPath, outputDir, cleanOutput} =
+      when cleanOutput (cleanViewerDir outputDir)
+      >> viewerDistOr viewerPath >>= deployTo outputDir
       >> writeJSON (outputDir </> "config.json") viewerConfig
 
       where
         cleanViewerDir :: FilePath -> IO ()
         cleanViewerDir target =
           listDirectory target
-          >>= return . filter (/= gallerySubdir)
-          >>= mapM_ remove . map (target </>)
+          <&> filter (/= gallerySubdir)
+          >>= mapM_ (remove . (target </>))
+
+        viewerDistOr :: FilePath -> IO FilePath
+        viewerDistOr "" = viewerDistPath
+        viewerDistOr custom = pure custom
 
-        copyViewer :: FilePath -> FilePath -> IO ()
-        copyViewer dist target =
+        deployTo :: FilePath -> FilePath -> IO ()
+        deployTo target dist =
           putStrLn "Copying viewer webapp"
           >>  readDirectory dist
           >>= copyTo target