diff --git a/hledger-web/Handler/Common.hs b/hledger-web/Handler/Common.hs index 8ea88f7e5..30935094d 100644 --- a/hledger-web/Handler/Common.hs +++ b/hledger-web/Handler/Common.hs @@ -6,7 +6,6 @@ module Handler.Common where import Import import Data.List -import Data.Maybe import Data.Text(pack) import Data.Time.Calendar import System.FilePath (takeFileName) @@ -326,7 +325,6 @@ balanceReportAsHtml _ vd@VD{..} (items',total) = where l = ledgerFromJournal Any j inacctmatcher = inAccountQuery qopts - allaccts = isNothing inacctmatcher items = items' -- maybe items' (\m -> filter (matchesAccount m . \(a,_,_,_)->a) items') showacctmatcher itemAsHtml :: ViewData -> BalanceReportItem -> HtmlUrl AppRoute itemAsHtml _ ((acct, adisplay, aindent), abal) = [hamlet| diff --git a/hledger-web/Handler/Post.hs b/hledger-web/Handler/Post.hs index f46403538..5c0a68b06 100644 --- a/hledger-web/Handler/Post.hs +++ b/hledger-web/Handler/Post.hs @@ -9,7 +9,6 @@ import Data.List (intercalate) import qualified Data.List as L (head) -- qualified keeps dev & prod builds warning-free import Data.Text (unpack) import qualified Data.Text as T (null) -import Text.Hamlet (shamlet) import Text.Printf (printf) import Handler.Utils diff --git a/hledger-web/Hledger/Web/Main.hs b/hledger-web/Hledger/Web/Main.hs index af0100a6e..2c5ec361f 100644 --- a/hledger-web/Hledger/Web/Main.hs +++ b/hledger-web/Hledger/Web/Main.hs @@ -10,13 +10,11 @@ module Hledger.Web.Main where -- yesod scaffold imports -import Prelude (IO) import Yesod.Default.Config --(fromArgs) -- import Yesod.Default.Main (defaultMain) import Settings -- (parseExtra) import Application (makeApplication) import Data.String -import Data.Conduit.Network hiding (setPort) import Network.Wai.Handler.Warp (runSettings, defaultSettings, setPort) import Network.Wai.Handler.Launch (runUrlPort) -- diff --git a/hledger-web/devel.hs b/hledger-web/devel.hs index 551043854..5b318aaa4 100644 --- a/hledger-web/devel.hs +++ b/hledger-web/devel.hs @@ -1,6 +1,6 @@ {-# LANGUAGE PackageImports #-} 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 System.Directory (doesFileExist, removeFile) import System.Exit (exitSuccess) @@ -10,10 +10,7 @@ main :: IO () main = do putStrLn "Starting devel application" (port, app) <- getApplicationDev - forkIO $ - runSettings defaultSettings - { settingsPort = port - } app + forkIO $ runSettings (setPort port defaultSettings) app loop loop :: IO ()