The web app's journal state is now kept in the yesod App as an IORef, instead of using io-storage. yesod devel now works; it uses the journal file specified by $LEDGER_FILE, or ~/.hledger.journal. web: update journal state handling, fix yesod devel - WIP
		
			
				
	
	
		
			67 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			Haskell
		
	
	
	
	
	
			
		
		
	
	
			67 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			Haskell
		
	
	
	
	
	
| {-# OPTIONS_GHC -fno-warn-orphans #-}
 | |
| module Application
 | |
|     ( makeApplication
 | |
|     , getApplicationDev
 | |
|     , makeFoundation
 | |
|     ) where
 | |
| 
 | |
| import Data.IORef
 | |
| import Import
 | |
| import Yesod.Default.Config
 | |
| import Yesod.Default.Main
 | |
| import Yesod.Default.Handlers
 | |
| import Network.Wai.Middleware.RequestLogger (logStdout, logStdoutDev)
 | |
| import Network.HTTP.Conduit (newManager, def)
 | |
| 
 | |
| -- Import all relevant handler modules here.
 | |
| -- Don't forget to add new modules to your cabal file!
 | |
| import Handler.RootR
 | |
| import Handler.JournalR
 | |
| import Handler.JournalEditR
 | |
| import Handler.JournalEntriesR
 | |
| import Handler.RegisterR
 | |
| 
 | |
| import Hledger.Web.Options (defwebopts)
 | |
| import Hledger.Data (Journal, nulljournal)
 | |
| import Hledger.Read (readJournalFile)
 | |
| import Hledger.Utils (error')
 | |
| import Hledger.Cli.Options (defcliopts, journalFilePathFromOpts)
 | |
| 
 | |
| -- This line actually creates our YesodDispatch instance. It is the second half
 | |
| -- of the call to mkYesodData which occurs in Foundation.hs. Please see the
 | |
| -- comments there for more details.
 | |
| mkYesodDispatch "App" resourcesApp
 | |
| 
 | |
| -- This function allocates resources (such as a database connection pool),
 | |
| -- performs initialization and creates a WAI application. This is also the
 | |
| -- place to put your migrate statements to have automatic database
 | |
| -- migrations handled by Yesod.
 | |
| makeApplication :: Journal -> AppConfig DefaultEnv Extra -> IO Application
 | |
| makeApplication j conf = do
 | |
|     foundation <- makeFoundation conf
 | |
|     writeIORef (appJournal foundation) j
 | |
|     app <- toWaiAppPlain foundation
 | |
|     return $ logWare app
 | |
|   where
 | |
|     logWare   = if development then logStdoutDev
 | |
|                                else logStdout
 | |
| 
 | |
| makeFoundation :: AppConfig DefaultEnv Extra -> IO App
 | |
| makeFoundation conf = do
 | |
|     manager <- newManager def
 | |
|     s <- staticSite
 | |
|     jref <- newIORef nulljournal
 | |
|     return $ App conf s manager defwebopts jref
 | |
| 
 | |
| -- for yesod devel
 | |
| -- uses the journal specified by the LEDGER_FILE env var, or ~/.hledger.journal
 | |
| getApplicationDev :: IO (Int, Application)
 | |
| getApplicationDev = do
 | |
|   f <- journalFilePathFromOpts defcliopts
 | |
|   j <- either error' id `fmap` readJournalFile Nothing Nothing f
 | |
|   defaultDevelApp loader (makeApplication j)
 | |
|   where
 | |
|     loader = loadConfig (configSettings Development)
 | |
|         { csParseExtra = parseExtra
 | |
|         }
 |