reanimate 0.1.2.0 → 0.1.4.0

raw patch · 2 files changed

+27/−16 lines, 2 files

Files

• reanimate.cabal +2/−2
• src/Reanimate/Driver.hs +25/−14

@@ -2,7 +2,7 @@ --  see http://haskell.org/cabal/users-guide/  name:                reanimate-version:             0.1.2.0+version:             0.1.4.0 -- synopsis: -- description: license:             PublicDomain@@ -60,7 +60,7 @@                        diagrams-core, diagrams-lib, diagrams-contrib,                        svg-builder, matrices, cubicbezier, palette, websockets,                        hashable-  if flag(inotify)+  if os(linux) && flag(inotify)     hs-source-dirs:    unix     build-depends:     hinotify   else

@@ -1,21 +1,22 @@ module Reanimate.Driver ( reanimate ) where -import           Control.Concurrent (MVar, forkIO, killThread, modifyMVar_,-                                     newEmptyMVar, putMVar)-import           Control.Monad.Fix  (fix)-import qualified Data.Text          as T+import           Control.Concurrent  (MVar, forkIO, killThread, modifyMVar_,+                                      newEmptyMVar, putMVar)+import           Control.Monad.Fix   (fix)+import qualified Data.Text           as T import           Network.WebSockets-import           System.Directory   (findFile, listDirectory)-import           System.Environment (getArgs, getProgName) import           Reanimate.FileWatch (watchFile)-import           System.IO          (BufferMode (..), hPutStrLn, hSetBuffering,-                                     stderr, stdin)--import           Reanimate.Misc     (runCmdLazy, runCmd, runCmd_, withTempDir, withTempFile)-import           Reanimate.Monad    (Animation)-import           Reanimate.Render   (renderSvgs)+import           System.Directory    (findFile, listDirectory, findExecutable)+import           System.Environment  (getArgs, getProgName)+import           System.IO           (BufferMode (..), hPutStrLn, hSetBuffering,+                                      stderr, stdin) -import Paths_reanimate+import           Data.Maybe+import           Paths_reanimate+import           Reanimate.Misc      (runCmd, runCmdLazy, runCmd_, withTempDir,+                                      withTempFile)+import           Reanimate.Monad     (Animation)+import           Reanimate.Render    (renderSvgs)  opts = defaultConnectionOptions   { connectionCompressionOptions = PermessageDeflateCompression defaultPermessageDeflate }@@ -28,7 +29,7 @@     ["once"] -> renderSvgs animation     _ -> withTempDir $ \tmpDir -> do       url <- getDataFileName "viewer/build/index.html"-      runCmd "xdg-open" [url]+      openBrowser url       runServerWith "127.0.0.1" 9161 opts $ \pending -> do         putStrLn "Server pending."         prog <- getProgName@@ -78,3 +79,13 @@ ghcOptions tmpDir =     ["-rtsopts", "--make", "-threaded", "-O2"] ++     ["-odir", tmpDir, "-hidir", tmpDir]++openBrowser :: String -> IO ()+openBrowser url = do+  xdgOpen <- findExecutable "xdg-open"+  open <- findExecutable "open"+  case listToMaybe (catMaybes [xdgOpen, open]) of+    Nothing ->+      hPutStrLn stderr $ "Failed to open browser. Manually visit: " ++ url+    Just prog ->+      runCmd prog [url]