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

convert: give a useful error, not a null date when parsing fails; refactor

Browse Source
This commit is contained in:
Simon Michael 2011-09-28 17:12:43 +00:00
parent bdbc93ca5c
commit 602ccceeec
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -426,19 +426,37 @@ transactionFromCsvRecord rules fields =
-- | Convert some date string with unknown format to YYYY/MM/DD. -- | Convert some date string with unknown format to YYYY/MM/DD.
normaliseDate :: Maybe String -- ^ User-supplied date format: this should be tried in preference to all others normaliseDate :: Maybe String -- ^ User-supplied date format: this should be tried in preference to all others
-> String -> String -> String -> String
normaliseDate mb_user_format s = maybe "0000/00/00" showDate $ normaliseDate mb_user_format s =
firstJust $ let parsewith = flip (parseTime defaultTimeLocale) s in
(maybe id (\user_format -> (parseTime defaultTimeLocale user_format s :)) mb_user_format) $ maybe (error' $ "could not parse \""++s++"\" as a date, consider adding a date-format directive or upgrading")
[parseTime defaultTimeLocale "%Y/%m/%e" s showDate $
-- can't parse a month without leading 0, try adding one firstJust $ (map parsewith $
,parseTime defaultTimeLocale "%Y/%m/%e" (take 5 s ++ "0" ++ drop 5 s) maybe [] (:[]) mb_user_format
,parseTime defaultTimeLocale "%Y-%m-%e" s -- the - modifier requires time-1.2.0.5, released
,parseTime defaultTimeLocale "%Y-%m-%e" (take 5 s ++ "0" ++ drop 5 s) -- in 2011/5, so for now we emulate it for wider
,parseTime defaultTimeLocale "%m/%e/%Y" s -- compatibility. time < 1.2.0.5 also has a buggy
,parseTime defaultTimeLocale "%m/%e/%Y" ('0':s) -- %y which we don't do anything about.
,parseTime defaultTimeLocale "%m-%e-%Y" s -- ++ [
,parseTime defaultTimeLocale "%m-%e-%Y" ('0':s) -- "%Y/%m/%d"
] -- ,"%Y/%-m/%-d"
-- ,"%Y-%m-%d"
-- ,"%Y-%-m-%-d"
-- ,"%m/%d/%Y"
-- ,"%-m/%-d/%Y"
-- ,"%m-%d-%Y"
-- ,"%-m-%-d-%Y"
-- ]
)
++ [
parseTime defaultTimeLocale "%Y/%m/%e" s
,parseTime defaultTimeLocale "%Y-%m-%e" s
,parseTime defaultTimeLocale "%m/%e/%Y" s
,parseTime defaultTimeLocale "%m-%e-%Y" s
,parseTime defaultTimeLocale "%Y/%m/%e" (take 5 s ++ "0" ++ drop 5 s)
,parseTime defaultTimeLocale "%Y-%m-%e" (take 5 s ++ "0" ++ drop 5 s)
,parseTime defaultTimeLocale "%m/%e/%Y" ('0':s)
,parseTime defaultTimeLocale "%m-%e-%Y" ('0':s)
]
-- | Apply account matching rules to a transaction description to obtain -- | Apply account matching rules to a transaction description to obtain
-- the most appropriate account and a new description. -- the most appropriate account and a new description.