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

convert: always order converted transactions by date

Browse Source
This commit is contained in:
Simon Michael 2011-09-21 06:04:18 +00:00
parent 2b5bd268b9
commit 353e3f2d55
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hledger/Hledger/Cli/Convert.hs
View File

@ -5,7 +5,9 @@ format, and print it on stdout. See the manual for more details.
module Hledger.Cli.Convert where module Hledger.Cli.Convert where
import Control.Monad (when, guard, liftM) import Control.Monad (when, guard, liftM)
import Data.List
import Data.Maybe import Data.Maybe
import Data.Ord
import Data.Time.Format (parseTime) import Data.Time.Format (parseTime)
import Safe import Safe
import System.Directory (doesFileExist) import System.Directory (doesFileExist)
@ -14,7 +16,7 @@ import System.FilePath (takeBaseName, replaceExtension)
import System.IO (stderr) import System.IO (stderr)
import System.Locale (defaultTimeLocale) import System.Locale (defaultTimeLocale)
import Test.HUnit import Test.HUnit
import Text.CSV (parseCSV, parseCSVFromFile, printCSV, CSV) import Text.CSV (parseCSV, parseCSVFromFile, CSV)
import Text.ParserCombinators.Parsec import Text.ParserCombinators.Parsec
import Text.Printf (hPrintf) import Text.Printf (hPrintf)
@ -104,7 +106,8 @@ convert opts = do
let requiredfields = max 2 (maxFieldIndex rules + 1) let requiredfields = max 2 (maxFieldIndex rules + 1)
badrecords = take 1 $ filter ((< requiredfields).length) records badrecords = take 1 $ filter ((< requiredfields).length) records
if null badrecords if null badrecords
then mapM_ (printTxn (debug_ opts) rules) records then do
mapM_ (putStr . show) $ sortBy (comparing tdate) $ map (transactionFromCsvRecord rules) records
else do else do
hPrintf stderr (unlines [ hPrintf stderr (unlines [
"Warning, at least one CSV record does not contain a field referenced by the" "Warning, at least one CSV record does not contain a field referenced by the"
@ -340,11 +343,6 @@ matchreplacepattern = do
newline newline
return (matchpat,replpat) return (matchpat,replpat)
printTxn :: Bool -> CsvRules -> CsvRecord -> IO ()
printTxn debug rules rec = do
when debug $ hPrintf stderr "record: %s" (printCSV [rec])
putStr $ show $ transactionFromCsvRecord rules rec
-- csv record conversion -- csv record conversion
formatD :: CsvRecord -> Bool -> Maybe Int -> Maybe Int -> Field -> String formatD :: CsvRecord -> Bool -> Maybe Int -> Maybe Int -> Field -> String
formatD record leftJustified min max f = case f of formatD record leftJustified min max f = case f of