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

csv: show the "creating/using rules file" message only with --debug

Browse Source
This commit is contained in:
Simon Michael 2017-07-06 14:07:46 +01:00
parent 817292a1dd
commit b3b33336b4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hledger-lib/Hledger/Read/CsvReader.hs
View File

@ -52,13 +52,12 @@ import System.Locale (defaultTimeLocale)
import Safe import Safe
import System.Directory (doesFileExist) import System.Directory (doesFileExist)
import System.FilePath import System.FilePath
import System.IO (stderr)
import Test.HUnit hiding (State) import Test.HUnit hiding (State)
import Text.CSV (parseCSV, CSV) import Text.CSV (parseCSV, CSV)
import Text.Megaparsec hiding (parse, State) import Text.Megaparsec hiding (parse, State)
import Text.Megaparsec.Text import Text.Megaparsec.Text
import qualified Text.Parsec as Parsec import qualified Text.Parsec as Parsec
import Text.Printf (hPrintf,printf) import Text.Printf (printf)
import Hledger.Data import Hledger.Data
import Hledger.Utils.UTF8IOCompat (getContents) import Hledger.Utils.UTF8IOCompat (getContents)
@ -106,7 +105,7 @@ readJournalFromCsv mrulesfile csvfile csvdata =
rulestext <- rulestext <-
if rulesfileexists if rulesfileexists
then do then do
hPrintf stderr "using conversion rules file %s\n" rulesfile dbg1IO "using conversion rules file" rulesfile
liftIO $ (readFile' rulesfile >>= expandIncludes (takeDirectory rulesfile)) liftIO $ (readFile' rulesfile >>= expandIncludes (takeDirectory rulesfile))
else return $ defaultRulesText rulesfile else return $ defaultRulesText rulesfile
rules <- liftIO (runExceptT $ parseAndValidateCsvRules rulesfile rulestext) >>= either throwerr return rules <- liftIO (runExceptT $ parseAndValidateCsvRules rulesfile rulestext) >>= either throwerr return
@ -159,7 +158,7 @@ readJournalFromCsv mrulesfile csvfile csvdata =
txns'' = sortBy (comparing tdate) txns' txns'' = sortBy (comparing tdate) txns'
when (not rulesfileexists) $ do when (not rulesfileexists) $ do
hPrintf stderr "created default conversion rules file %s, edit this for better results\n" rulesfile dbg1IO "creating conversion rules file" rulesfile
writeFile rulesfile $ T.unpack rulestext writeFile rulesfile $ T.unpack rulestext
return $ Right nulljournal{jtxns=txns''} return $ Right nulljournal{jtxns=txns''}