Merge pull request #294 from ldgallery/pacien-20210629-portable-viewer-dist

compiler: portable viewer dist

2 files changed, 52 insertions, 16 deletions

diff --git a/compiler/app/Main.hs b/compiler/app/Main.hs
index dc97b38..3e6f254 100644
--- a/compiler/app/Main.hs
+++ b/compiler/app/Main.hs
@@ -19,7 +19,7 @@
 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)
@@ -31,7 +31,7 @@ import System.Console.CmdArgs
 
 import Compiler
 import Files (readDirectory, copyTo, remove)
-
+import ViewerDist (viewerDistPath)
 
 newtype ViewerConfig = ViewerConfig
   { galleryRoot :: String
@@ -106,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
@@ -118,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)
@@ -146,10 +138,11 @@ main =
           | isJust withViewer = outputDir </> gallerySubdir
           | otherwise = outputDir
 
-    deployViewer :: FilePath -> Options -> IO ()
-    deployViewer distPath Options{outputDir, cleanOutput} =
+    deployViewer :: Options -> IO ()
+    deployViewer Options{withViewer = Nothing} = pure ()
+    deployViewer Options{withViewer = Just viewerPath, outputDir, cleanOutput} =
       when cleanOutput (cleanViewerDir outputDir)
-      >> copyViewer distPath outputDir
+      >> viewerDistOr viewerPath >>= deployTo outputDir
       >> writeJSON (outputDir </> "config.json") viewerConfig
 
       where
@@ -159,8 +152,12 @@ main =
           <&> filter (/= gallerySubdir)
           >>= mapM_ (remove . (target </>))
 
-        copyViewer :: FilePath -> FilePath -> IO ()
-        copyViewer dist target =
+        viewerDistOr :: FilePath -> IO FilePath
+        viewerDistOr "" = viewerDistPath
+        viewerDistOr custom = pure custom
+
+        deployTo :: FilePath -> FilePath -> IO ()
+        deployTo target dist =
           putStrLn "Copying viewer webapp"
           >>  readDirectory dist
           >>= copyTo target
diff --git a/compiler/app/ViewerDist.hs b/compiler/app/ViewerDist.hs
new file mode 100644
index 0000000..2b80ffc
--- /dev/null
+++ b/compiler/app/ViewerDist.hs
@@ -0,0 +1,39 @@
+-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 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
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Affero General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+{-# LANGUAGE CPP #-}
+
+module ViewerDist where
+
+#ifndef FLAG_PORTABLE
+
+import Paths_ldgallery_compiler (getDataFileName)
+
+viewerDistPath = getDataFileName "viewer"
+
+#else
+
+import Data.Functor ((<&>))
+import System.FilePath (takeDirectory, (</>))
+import System.Environment (getExecutablePath)
+
+viewerDistPath = fmap takeDirectory getExecutablePath <&> (</> "viewer")
+
+#endif
+
+viewerDistPath :: IO FilePath