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

web: fix warnings

Browse Source
This commit is contained in:
Simon Michael 2014-05-23 09:02:20 -07:00
parent 3c8786df1f
commit 702f900ec0
4 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hledger-web/Handler/Common.hs
View File

@ -6,7 +6,6 @@ module Handler.Common where
import Import import Import
import Data.List import Data.List
import Data.Maybe
import Data.Text(pack) import Data.Text(pack)
import Data.Time.Calendar import Data.Time.Calendar
import System.FilePath (takeFileName) import System.FilePath (takeFileName)
@ -326,7 +325,6 @@ balanceReportAsHtml _ vd@VD{..} (items',total) =
where where
l = ledgerFromJournal Any j l = ledgerFromJournal Any j
inacctmatcher = inAccountQuery qopts inacctmatcher = inAccountQuery qopts
allaccts = isNothing inacctmatcher
items = items' -- maybe items' (\m -> filter (matchesAccount m . \(a,_,_,_)->a) items') showacctmatcher items = items' -- maybe items' (\m -> filter (matchesAccount m . \(a,_,_,_)->a) items') showacctmatcher
itemAsHtml :: ViewData -> BalanceReportItem -> HtmlUrl AppRoute itemAsHtml :: ViewData -> BalanceReportItem -> HtmlUrl AppRoute
itemAsHtml _ ((acct, adisplay, aindent), abal) = [hamlet| itemAsHtml _ ((acct, adisplay, aindent), abal) = [hamlet|

1
hledger-web/Handler/Post.hs
View File

@ -9,7 +9,6 @@ import Data.List (intercalate)
import qualified Data.List as L (head) -- qualified keeps dev & prod builds warning-free import qualified Data.List as L (head) -- qualified keeps dev & prod builds warning-free
import Data.Text (unpack) import Data.Text (unpack)
import qualified Data.Text as T (null) import qualified Data.Text as T (null)
import Text.Hamlet (shamlet)
import Text.Printf (printf) import Text.Printf (printf)
import Handler.Utils import Handler.Utils

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

@ -10,13 +10,11 @@ module Hledger.Web.Main
where where
-- yesod scaffold imports -- yesod scaffold imports
import Prelude (IO)
import Yesod.Default.Config --(fromArgs) import Yesod.Default.Config --(fromArgs)
-- import Yesod.Default.Main (defaultMain) -- import Yesod.Default.Main (defaultMain)
import Settings -- (parseExtra) import Settings -- (parseExtra)
import Application (makeApplication) import Application (makeApplication)
import Data.String import Data.String
import Data.Conduit.Network hiding (setPort)
import Network.Wai.Handler.Warp (runSettings, defaultSettings, setPort) import Network.Wai.Handler.Warp (runSettings, defaultSettings, setPort)
import Network.Wai.Handler.Launch (runUrlPort) import Network.Wai.Handler.Launch (runUrlPort)
-- --

7
hledger-web/devel.hs
View File

@ -1,6 +1,6 @@
{-# LANGUAGE PackageImports #-} {-# LANGUAGE PackageImports #-}
import "hledger-web" Application (getApplicationDev) import "hledger-web" Application (getApplicationDev)
import Network.Wai.Handler.Warp (runSettings, defaultSettings, settingsPort) import Network.Wai.Handler.Warp (runSettings, defaultSettings, setPort)
import Control.Concurrent (forkIO) import Control.Concurrent (forkIO)
import System.Directory (doesFileExist, removeFile) import System.Directory (doesFileExist, removeFile)
import System.Exit (exitSuccess) import System.Exit (exitSuccess)
@ -10,10 +10,7 @@ main :: IO ()
main = do main = do
putStrLn "Starting devel application" putStrLn "Starting devel application"
(port, app) <- getApplicationDev (port, app) <- getApplicationDev
forkIO $ forkIO $ runSettings (setPort port defaultSettings) app
runSettings defaultSettings
{ settingsPort = port
} app
loop loop
loop :: IO () loop :: IO ()