drop unused TIMELOG env var
This commit is contained in:
parent
556e3c9246
commit
de502e732b
@ -11,9 +11,7 @@ module Hledger.Read (
|
|||||||
journalFromPathAndString,
|
journalFromPathAndString,
|
||||||
ledgeraccountname,
|
ledgeraccountname,
|
||||||
myJournalPath,
|
myJournalPath,
|
||||||
myTimelogPath,
|
|
||||||
myJournal,
|
myJournal,
|
||||||
myTimelog,
|
|
||||||
someamount,
|
someamount,
|
||||||
journalenvvar,
|
journalenvvar,
|
||||||
journaldefaultfilename,
|
journaldefaultfilename,
|
||||||
@ -45,9 +43,7 @@ import Hledger.Utils.UTF8 (getContents, hGetContents, writeFile)
|
|||||||
|
|
||||||
journalenvvar = "LEDGER_FILE"
|
journalenvvar = "LEDGER_FILE"
|
||||||
journalenvvar2 = "LEDGER"
|
journalenvvar2 = "LEDGER"
|
||||||
timelogenvvar = "TIMELOG"
|
|
||||||
journaldefaultfilename = ".hledger.journal"
|
journaldefaultfilename = ".hledger.journal"
|
||||||
timelogdefaultfilename = ".hledger.timelog"
|
|
||||||
|
|
||||||
-- Here are the available readers. The first is the default, used for unknown data formats.
|
-- Here are the available readers. The first is the default, used for unknown data formats.
|
||||||
readers :: [Reader]
|
readers :: [Reader]
|
||||||
@ -144,22 +140,10 @@ myJournalPath = do
|
|||||||
home <- getHomeDirectory `catch` (\_ -> return "")
|
home <- getHomeDirectory `catch` (\_ -> return "")
|
||||||
return $ home </> journaldefaultfilename
|
return $ home </> journaldefaultfilename
|
||||||
|
|
||||||
-- | Get the user's default timelog file path.
|
|
||||||
myTimelogPath :: IO String
|
|
||||||
myTimelogPath =
|
|
||||||
getEnv timelogenvvar `catch`
|
|
||||||
(\_ -> do
|
|
||||||
home <- getHomeDirectory
|
|
||||||
return $ home </> timelogdefaultfilename)
|
|
||||||
|
|
||||||
-- | Read the user's default journal file, or give an error.
|
-- | Read the user's default journal file, or give an error.
|
||||||
myJournal :: IO Journal
|
myJournal :: IO Journal
|
||||||
myJournal = myJournalPath >>= readJournalFile Nothing >>= either error' return
|
myJournal = myJournalPath >>= readJournalFile Nothing >>= either error' return
|
||||||
|
|
||||||
-- | Read the user's default timelog file, or give an error.
|
|
||||||
myTimelog :: IO Journal
|
|
||||||
myTimelog = myTimelogPath >>= readJournalFile Nothing >>= either error' return
|
|
||||||
|
|
||||||
tests_Hledger_Read = TestList
|
tests_Hledger_Read = TestList
|
||||||
[
|
[
|
||||||
tests_Hledger_Read_JournalReader,
|
tests_Hledger_Read_JournalReader,
|
||||||
|
|||||||
@ -31,7 +31,6 @@ or ghci:
|
|||||||
> $-2 income
|
> $-2 income
|
||||||
> $1 liabilities
|
> $1 liabilities
|
||||||
> > l <- myLedger
|
> > l <- myLedger
|
||||||
> > t <- myTimelog
|
|
||||||
|
|
||||||
See "Hledger.Data.Ledger" for more examples.
|
See "Hledger.Data.Ledger" for more examples.
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user