slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web: fix --file-url option (#285)

Browse Source 
Finish the rename begun by 3fb5e25.
This commit is contained in:
Simon Michael 2015-09-28 10:06:36 -10:00
parent 5404eab6c0
commit 09430f09da
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hledger-web/Hledger/Web/Main.hs
View File

@ -69,13 +69,13 @@ web opts j = do
let j' = filterJournalTransactions (queryFromOpts d $ reportopts_ $ cliopts_ opts) j let j' = filterJournalTransactions (queryFromOpts d $ reportopts_ $ cliopts_ opts) j
p = port_ opts p = port_ opts
u = base_url_ opts u = base_url_ opts
staticRoot' = pack <$> static_root_ opts staticRoot = pack <$> file_url_ opts
_ <- printf "Starting web app on port %d with base url %s\n" p u _ <- printf "Starting web app on port %d with base url %s\n" p u
app <- makeApplication opts j' AppConfig{appEnv = Development app <- makeApplication opts j' AppConfig{appEnv = Development
,appPort = p ,appPort = p
,appRoot = pack u ,appRoot = pack u
,appHost = fromString "*4" ,appHost = fromString "*4"
,appExtra = Extra "" Nothing staticRoot' ,appExtra = Extra "" Nothing staticRoot
} }
if server_ opts if server_ opts
then do then do

6
hledger-web/Hledger/Web/WebOptions.hs
View File

@ -50,9 +50,9 @@ webmode = (mode "hledger-web" [("command","web")]
-- hledger-web options, used in hledger-web and above -- hledger-web options, used in hledger-web and above
data WebOpts = WebOpts { data WebOpts = WebOpts {
server_ :: Bool server_ :: Bool
,base_url_ :: String
,port_ :: Int ,port_ :: Int
,static_root_ :: Maybe String ,base_url_ :: String
,file_url_ :: Maybe String
,cliopts_ :: CliOpts ,cliopts_ :: CliOpts
} deriving (Show) } deriving (Show)
@ -74,7 +74,7 @@ rawOptsToWebOpts rawopts = checkWebOpts <$> do
port_ = p port_ = p
,server_ = boolopt "server" rawopts ,server_ = boolopt "server" rawopts
,base_url_ = maybe (defbaseurl p) stripTrailingSlash $ maybestringopt "base-url" rawopts ,base_url_ = maybe (defbaseurl p) stripTrailingSlash $ maybestringopt "base-url" rawopts
,static_root_ = stripTrailingSlash <$> maybestringopt "static-root" rawopts ,file_url_ = stripTrailingSlash <$> maybestringopt "file-url" rawopts
,cliopts_ = cliopts ,cliopts_ = cliopts
} }
where where