hledger/hledger-lib/Hledger/Data/Dates.hs

1012 lines
39 KiB
Haskell
Raw Normal View History

{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE NoMonoLocalBinds #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE PackageImports #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TupleSections #-}
{-# LANGUAGE TypeFamilies #-}
{-|
2009-12-13 01:19:57 +03:00
Date parsing and utilities for hledger.
2008-11-27 07:31:01 +03:00
For date and time values, we use the standard Day and UTCTime types.
A 'SmartDate' is a date which may be partially-specified or relative.
2009-12-13 01:19:57 +03:00
Eg 2008\/12\/31, but also 2008\/12, 12\/31, tomorrow, last week, next year.
2008-11-27 10:50:02 +03:00
We represent these as a triple of strings like (\"2008\",\"12\",\"\"),
(\"\",\"\",\"tomorrow\"), (\"\",\"last\",\"week\").
2008-11-27 07:31:01 +03:00
A 'DateSpan' is the span of time between two specific calendar dates, or
an open-ended span where one or both dates are unspecified. (A date span
with both ends unspecified matches all dates.)
2010-08-03 21:05:02 +04:00
An 'Interval' is ledger's \"reporting interval\" - weekly, monthly,
quarterly, etc.
2008-11-27 07:31:01 +03:00
'Period' will probably replace DateSpan in due course.
-}
-- XXX fromGregorian silently clips bad dates, use fromGregorianValid instead ?
module Hledger.Data.Dates (
-- * Misc date handling utilities
getCurrentDay,
getCurrentMonth,
getCurrentYear,
nulldate,
spanContainsDate,
periodContainsDate,
parsedateM,
showDate,
showDateSpan,
showDateSpanMonthAbbrev,
elapsedSeconds,
prevday,
periodexprp,
parsePeriodExpr,
parsePeriodExpr',
nulldatespan,
emptydatespan,
datesepchar,
datesepchars,
isDateSepChar,
spanStart,
spanEnd,
spanStartYear,
spanEndYear,
spanYears,
spansSpan,
spanIntersect,
2012-05-19 06:56:26 +04:00
spansIntersect,
2014-04-19 19:38:03 +04:00
spanDefaultsFrom,
2012-05-19 06:56:26 +04:00
spanUnion,
spansUnion,
daysSpan,
latestSpanContaining,
smartdate,
splitSpan,
fixSmartDate,
fixSmartDateStr,
2012-04-16 21:09:27 +04:00
fixSmartDateStrEither,
fixSmartDateStrEither',
yearp,
daysInSpan,
maybePeriod,
)
2008-11-22 15:18:19 +03:00
where
import Prelude ()
import "base-compat-batteries" Prelude.Compat hiding (fail)
import qualified "base-compat-batteries" Control.Monad.Fail.Compat as Fail (MonadFail, fail)
import Control.Applicative (liftA2)
2018-09-30 04:32:08 +03:00
import Control.Applicative.Permutations
import Control.Monad (guard, unless)
import "base-compat-batteries" Data.List.Compat
import Data.Char (digitToInt, isDigit, ord)
import Data.Default
import Data.Foldable (asum)
import Data.Function (on)
2011-05-28 08:11:44 +04:00
import Data.Maybe
import qualified Data.Set as Set
import Data.Text (Text)
import qualified Data.Text as T
2015-03-28 01:42:32 +03:00
import Data.Time.Format hiding (months)
2011-05-28 08:11:44 +04:00
import Data.Time.Calendar
2008-11-27 04:49:13 +03:00
import Data.Time.Calendar.OrdinalDate
2011-05-28 08:11:44 +04:00
import Data.Time.Clock
import Data.Time.LocalTime
import Safe (headMay, lastMay, maximumMay, minimumMay)
import Text.Megaparsec
import Text.Megaparsec.Char
import Text.Megaparsec.Char.Lexer (decimal)
2018-09-30 04:32:08 +03:00
import Text.Megaparsec.Custom
2011-05-28 08:11:44 +04:00
import Text.Printf
2010-05-20 03:08:53 +04:00
import Hledger.Data.Types
import Hledger.Data.Period
2011-05-28 08:11:44 +04:00
import Hledger.Utils
-- Help ppShow parse and line-wrap DateSpans better in debug output.
instance Show DateSpan where
show s = "DateSpan " ++ T.unpack (showDateSpan s)
showDate :: Day -> Text
showDate = T.pack . show
-- | Render a datespan as a display string, abbreviating into a
-- compact form if possible.
showDateSpan :: DateSpan -> Text
showDateSpan = showPeriod . dateSpanAsPeriod
-- | Like showDateSpan, but show month spans as just the abbreviated month name
-- in the current locale.
showDateSpanMonthAbbrev :: DateSpan -> Text
showDateSpanMonthAbbrev = showPeriodMonthAbbrev . dateSpanAsPeriod
-- | Get the current local date.
getCurrentDay :: IO Day
2019-02-14 16:14:52 +03:00
getCurrentDay = localDay . zonedTimeToLocalTime <$> getZonedTime
2011-08-07 19:31:36 +04:00
-- | Get the current local month number.
getCurrentMonth :: IO Int
2019-02-14 16:14:52 +03:00
getCurrentMonth = second3 . toGregorian <$> getCurrentDay
2011-08-07 19:31:36 +04:00
-- | Get the current local year.
getCurrentYear :: IO Integer
2019-02-14 16:14:52 +03:00
getCurrentYear = first3 . toGregorian <$> getCurrentDay
elapsedSeconds :: Fractional a => UTCTime -> UTCTime -> a
2009-09-22 19:56:59 +04:00
elapsedSeconds t1 = realToFrac . diffUTCTime t1
spanStart :: DateSpan -> Maybe Day
spanStart (DateSpan d _) = d
spanEnd :: DateSpan -> Maybe Day
spanEnd (DateSpan _ d) = d
spanStartYear :: DateSpan -> Maybe Year
spanStartYear (DateSpan d _) = fmap (first3 . toGregorian) d
spanEndYear :: DateSpan -> Maybe Year
spanEndYear (DateSpan d _) = fmap (first3 . toGregorian) d
-- | Get the 0-2 years mentioned explicitly in a DateSpan.
spanYears :: DateSpan -> [Year]
spanYears (DateSpan ma mb) = mapMaybe (fmap (first3 . toGregorian)) [ma,mb]
-- might be useful later: http://en.wikipedia.org/wiki/Allen%27s_interval_algebra
-- | Get overall span enclosing multiple sequentially ordered spans.
spansSpan :: [DateSpan] -> DateSpan
spansSpan spans = DateSpan (maybe Nothing spanStart $ headMay spans) (maybe Nothing spanEnd $ lastMay spans)
-- | Split a DateSpan into consecutive whole spans of the specified interval
-- which fully encompass the original span (and a little more when necessary).
2014-04-14 19:31:34 +04:00
-- If no interval is specified, the original span is returned.
-- If the original span is the null date span, ie unbounded, the null date span is returned.
-- If the original span is empty, eg if the end date is <= the start date, no spans are returned.
--
--
-- ==== Examples:
-- >>> let t i y1 m1 d1 y2 m2 d2 = splitSpan i $ DateSpan (Just $ fromGregorian y1 m1 d1) (Just $ fromGregorian y2 m2 d2)
-- >>> t NoInterval 2008 01 01 2009 01 01
-- [DateSpan 2008]
-- >>> t (Quarters 1) 2008 01 01 2009 01 01
-- [DateSpan 2008Q1,DateSpan 2008Q2,DateSpan 2008Q3,DateSpan 2008Q4]
-- >>> splitSpan (Quarters 1) nulldatespan
-- [DateSpan ..]
-- >>> t (Days 1) 2008 01 01 2008 01 01 -- an empty datespan
-- []
-- >>> t (Quarters 1) 2008 01 01 2008 01 01
-- []
-- >>> t (Months 1) 2008 01 01 2008 04 01
-- [DateSpan 2008-01,DateSpan 2008-02,DateSpan 2008-03]
-- >>> t (Months 2) 2008 01 01 2008 04 01
-- [DateSpan 2008-01-01..2008-02-29,DateSpan 2008-03-01..2008-04-30]
-- >>> t (Weeks 1) 2008 01 01 2008 01 15
-- [DateSpan 2007-12-31W01,DateSpan 2008-01-07W02,DateSpan 2008-01-14W03]
-- >>> t (Weeks 2) 2008 01 01 2008 01 15
-- [DateSpan 2007-12-31..2008-01-13,DateSpan 2008-01-14..2008-01-27]
-- >>> t (DayOfMonth 2) 2008 01 01 2008 04 01
-- [DateSpan 2007-12-02..2008-01-01,DateSpan 2008-01-02..2008-02-01,DateSpan 2008-02-02..2008-03-01,DateSpan 2008-03-02..2008-04-01]
-- >>> t (WeekdayOfMonth 2 4) 2011 01 01 2011 02 15
-- [DateSpan 2010-12-09..2011-01-12,DateSpan 2011-01-13..2011-02-09,DateSpan 2011-02-10..2011-03-09]
-- >>> t (DayOfWeek 2) 2011 01 01 2011 01 15
-- [DateSpan 2010-12-28..2011-01-03,DateSpan 2011-01-04..2011-01-10,DateSpan 2011-01-11..2011-01-17]
-- >>> t (DayOfYear 11 29) 2011 10 01 2011 10 15
-- [DateSpan 2010-11-29..2011-11-28]
-- >>> t (DayOfYear 11 29) 2011 12 01 2012 12 15
-- [DateSpan 2011-11-29..2012-11-28,DateSpan 2012-11-29..2013-11-28]
--
splitSpan :: Interval -> DateSpan -> [DateSpan]
splitSpan _ (DateSpan Nothing Nothing) = [DateSpan Nothing Nothing]
splitSpan _ s | isEmptySpan s = []
splitSpan NoInterval s = [s]
splitSpan (Days n) s = splitspan startofday (applyN n nextday) s
splitSpan (Weeks n) s = splitspan startofweek (applyN n nextweek) s
splitSpan (Months n) s = splitspan startofmonth (applyN n nextmonth) s
splitSpan (Quarters n) s = splitspan startofquarter (applyN n nextquarter) s
splitSpan (Years n) s = splitspan startofyear (applyN n nextyear) s
splitSpan (DayOfMonth n) s = splitspan (nthdayofmonthcontaining n) (nthdayofmonth n . nextmonth) s
splitSpan (WeekdayOfMonth n wd) s = splitspan (nthweekdayofmonthcontaining n wd) (advancetonthweekday n wd . nextmonth) s
splitSpan (DayOfWeek n) s = splitspan (nthdayofweekcontaining n) (applyN (n-1) nextday . nextweek) s
2018-07-30 13:05:02 +03:00
splitSpan (DayOfYear m n) s = splitspan (nthdayofyearcontaining m n) (applyN (n-1) nextday . applyN (m-1) nextmonth . nextyear) s
-- splitSpan (WeekOfYear n) s = splitspan startofweek (applyN n nextweek) s
-- splitSpan (MonthOfYear n) s = splitspan startofmonth (applyN n nextmonth) s
-- splitSpan (QuarterOfYear n) s = splitspan startofquarter (applyN n nextquarter) s
-- Split the given span using the provided helper functions:
-- start is applied to the span's start date to get the first sub-span's start date
-- next is applied to a sub-span's start date to get the next sub-span's start date
splitspan :: (Day -> Day) -> (Day -> Day) -> DateSpan -> [DateSpan]
splitspan _ _ (DateSpan Nothing Nothing) = []
splitspan start next (DateSpan Nothing (Just e)) = splitspan start next (DateSpan (Just $ start e) (Just $ next $ start e))
splitspan start next (DateSpan (Just s) Nothing) = splitspan start next (DateSpan (Just $ start s) (Just $ next $ start s))
splitspan start next span@(DateSpan (Just s) (Just e))
| s == e = [span]
| otherwise = splitspan' start next span
where
splitspan' start next (DateSpan (Just s) (Just e))
| s >= e = []
| otherwise = DateSpan (Just subs) (Just sube) : splitspan' start next (DateSpan (Just sube) (Just e))
where subs = start s
sube = next subs
splitspan' _ _ _ = error' "won't happen, avoids warnings" -- PARTIAL:
-- | Count the days in a DateSpan, or if it is open-ended return Nothing.
daysInSpan :: DateSpan -> Maybe Integer
daysInSpan (DateSpan (Just d1) (Just d2)) = Just $ diffDays d2 d1
daysInSpan _ = Nothing
2010-07-11 22:56:36 +04:00
-- | Is this an empty span, ie closed with the end date on or before the start date ?
isEmptySpan :: DateSpan -> Bool
isEmptySpan (DateSpan (Just s) (Just e)) = e <= s
isEmptySpan _ = False
2010-07-11 22:56:36 +04:00
-- | Does the span include the given date ?
spanContainsDate :: DateSpan -> Day -> Bool
spanContainsDate (DateSpan Nothing Nothing) _ = True
spanContainsDate (DateSpan Nothing (Just e)) d = d < e
spanContainsDate (DateSpan (Just b) Nothing) d = d >= b
spanContainsDate (DateSpan (Just b) (Just e)) d = d >= b && d < e
-- | Does the period include the given date ?
-- (Here to avoid import cycle).
periodContainsDate :: Period -> Day -> Bool
periodContainsDate p = spanContainsDate (periodAsDateSpan p)
2012-05-19 06:56:26 +04:00
-- | Calculate the intersection of a number of datespans.
spansIntersect [] = nulldatespan
spansIntersect [d] = d
spansIntersect (d:ds) = d `spanIntersect` (spansIntersect ds)
-- | Calculate the intersection of two datespans.
--
-- For non-intersecting spans, gives an empty span beginning on the second's start date:
-- >>> DateSpan (Just $ fromGregorian 2018 01 01) (Just $ fromGregorian 2018 01 03) `spanIntersect` DateSpan (Just $ fromGregorian 2018 01 03) (Just $ fromGregorian 2018 01 05)
-- DateSpan 2018-01-03..2018-01-02
spanIntersect (DateSpan b1 e1) (DateSpan b2 e2) = DateSpan b e
where
b = latest b1 b2
e = earliest e1 e2
2014-04-19 19:38:03 +04:00
-- | Fill any unspecified dates in the first span with the dates from
-- the second one. Sort of a one-way spanIntersect.
spanDefaultsFrom (DateSpan a1 b1) (DateSpan a2 b2) = DateSpan a b
where a = if isJust a1 then a1 else a2
b = if isJust b1 then b1 else b2
2012-05-19 06:56:26 +04:00
-- | Calculate the union of a number of datespans.
spansUnion [] = nulldatespan
spansUnion [d] = d
spansUnion (d:ds) = d `spanUnion` (spansUnion ds)
-- | Calculate the union of two datespans.
spanUnion (DateSpan b1 e1) (DateSpan b2 e2) = DateSpan b e
where
b = earliest b1 b2
e = latest e1 e2
latest d Nothing = d
latest Nothing d = d
latest (Just d1) (Just d2) = Just $ max d1 d2
earliest d Nothing = d
earliest Nothing d = d
earliest (Just d1) (Just d2) = Just $ min d1 d2
-- | Calculate the minimal DateSpan containing all of the given Days (in the
-- usual exclusive-end-date sense: beginning on the earliest, and ending on
-- the day after the latest).
daysSpan :: [Day] -> DateSpan
daysSpan ds = DateSpan (minimumMay ds) (addDays 1 <$> maximumMay ds)
-- | Select the DateSpan containing a given Day, if any, from a given list of
-- DateSpans.
--
-- If the DateSpans are non-overlapping, this returns the unique containing
-- DateSpan, if it exists. If the DateSpans are overlapping, it will return the
-- containing DateSpan with the latest start date, and then latest end date.
-- Note: This will currently return `DateSpan (Just s) (Just e)` before it will
-- return `DateSpan (Just s) Nothing`. It's unclear which behaviour is desired.
-- This is irrelevant at the moment as it's never applied to any list with
-- overlapping DateSpans.
latestSpanContaining :: [DateSpan] -> Day -> Maybe DateSpan
latestSpanContaining datespans = go
where
go day = do
span <- Set.lookupLT supSpan spanSet
guard $ spanContainsDate span day
return span
where
-- The smallest DateSpan larger than any DateSpan containing day.
supSpan = DateSpan (Just $ addDays 1 day) Nothing
spanSet = Set.fromList $ filter (not . isEmptySpan) datespans
-- | Parse a period expression to an Interval and overall DateSpan using
-- the provided reference date, or return a parse error.
2018-09-30 04:32:08 +03:00
parsePeriodExpr
:: Day -> Text -> Either (ParseErrorBundle Text CustomErr) (Interval, DateSpan)
parsePeriodExpr refdate s = parsewith (periodexprp refdate <* eof) (T.toLower s)
-- | Like parsePeriodExpr, but call error' on failure.
parsePeriodExpr' :: Day -> Text -> (Interval, DateSpan)
parsePeriodExpr' refdate s =
either (error' . ("failed to parse:" ++) . customErrorBundlePretty) id $ -- PARTIAL:
parsePeriodExpr refdate s
maybePeriod :: Day -> Text -> Maybe (Interval,DateSpan)
maybePeriod refdate = either (const Nothing) Just . parsePeriodExpr refdate
-- | Show a DateSpan as a human-readable pseudo-period-expression string.
2012-05-07 00:42:34 +04:00
-- dateSpanAsText :: DateSpan -> String
-- dateSpanAsText (DateSpan Nothing Nothing) = "all"
-- dateSpanAsText (DateSpan Nothing (Just e)) = printf "to %s" (show e)
-- dateSpanAsText (DateSpan (Just b) Nothing) = printf "from %s" (show b)
-- dateSpanAsText (DateSpan (Just b) (Just e)) = printf "%s to %s" (show b) (show e)
-- | Convert a single smart date string to a date span using the provided
2010-03-09 20:38:12 +03:00
-- reference date, or raise an error.
2012-05-07 00:42:34 +04:00
-- spanFromSmartDateString :: Day -> String -> DateSpan
-- spanFromSmartDateString refdate s = spanFromSmartDate refdate sdate
-- where
-- sdate = fromparse $ parsewith smartdateonly s
spanFromSmartDate :: Day -> SmartDate -> DateSpan
spanFromSmartDate refdate sdate = DateSpan (Just b) (Just e)
where
(ry,rm,_) = toGregorian refdate
(b,e) = span sdate
span :: SmartDate -> (Day,Day)
span (SmartRelative This Day) = (refdate, nextday refdate)
span (SmartRelative Last Day) = (prevday refdate, refdate)
span (SmartRelative Next Day) = (nextday refdate, addDays 2 refdate)
span (SmartRelative This Week) = (thisweek refdate, nextweek refdate)
span (SmartRelative Last Week) = (prevweek refdate, thisweek refdate)
span (SmartRelative Next Week) = (nextweek refdate, startofweek $ addDays 14 refdate)
span (SmartRelative This Month) = (thismonth refdate, nextmonth refdate)
span (SmartRelative Last Month) = (prevmonth refdate, thismonth refdate)
span (SmartRelative Next Month) = (nextmonth refdate, startofmonth $ addGregorianMonthsClip 2 refdate)
span (SmartRelative This Quarter) = (thisquarter refdate, nextquarter refdate)
span (SmartRelative Last Quarter) = (prevquarter refdate, thisquarter refdate)
span (SmartRelative Next Quarter) = (nextquarter refdate, startofquarter $ addGregorianMonthsClip 6 refdate)
span (SmartRelative This Year) = (thisyear refdate, nextyear refdate)
span (SmartRelative Last Year) = (prevyear refdate, thisyear refdate)
span (SmartRelative Next Year) = (nextyear refdate, startofyear $ addGregorianYearsClip 2 refdate)
span (SmartAssumeStart y Nothing) = (startofyear day, nextyear day) where day = fromGregorian y 1 1
span (SmartAssumeStart y (Just (m, Nothing))) = (startofmonth day, nextmonth day) where day = fromGregorian y m 1
span (SmartAssumeStart y (Just (m, Just d))) = (day, nextday day) where day = fromGregorian y m d
span (SmartFromReference m d) = (day, nextday day) where day = fromGregorian ry (fromMaybe rm m) d
span (SmartMonth m) = (startofmonth day, nextmonth day) where day = fromGregorian ry m 1
2012-05-07 00:42:34 +04:00
-- showDay :: Day -> String
-- showDay day = printf "%04d/%02d/%02d" y m d where (y,m,d) = toGregorian day
2010-03-09 21:33:26 +03:00
2009-12-13 01:19:57 +03:00
-- | Convert a smart date string to an explicit yyyy\/mm\/dd string using
2010-03-09 20:38:12 +03:00
-- the provided reference date, or raise an error.
fixSmartDateStr :: Day -> Text -> Text
2019-02-14 16:14:52 +03:00
fixSmartDateStr d s =
either (error' . printf "could not parse date %s %s" (show s) . show) id $ -- PARTIAL:
(fixSmartDateStrEither d s :: Either (ParseErrorBundle Text CustomErr) Text)
2010-03-09 21:33:26 +03:00
-- | A safe version of fixSmartDateStr.
fixSmartDateStrEither :: Day -> Text -> Either (ParseErrorBundle Text CustomErr) Text
2019-02-14 16:14:52 +03:00
fixSmartDateStrEither d = fmap showDate . fixSmartDateStrEither' d
2011-08-15 02:39:48 +04:00
2018-09-30 04:32:08 +03:00
fixSmartDateStrEither'
:: Day -> Text -> Either (ParseErrorBundle Text CustomErr) Day
fixSmartDateStrEither' d s = case parsewith smartdateonly (T.toLower s) of
2011-08-15 02:39:48 +04:00
Right sd -> Right $ fixSmartDate d sd
Left e -> Left e
2008-11-27 09:48:46 +03:00
-- | Convert a SmartDate to an absolute date using the provided reference date.
--
-- ==== Examples:
-- >>> :set -XOverloadedStrings
-- >>> let t = fixSmartDateStr (fromGregorian 2008 11 26)
-- >>> t "0000-01-01"
-- "0000-01-01"
-- >>> t "1999-12-02"
-- "1999-12-02"
-- >>> t "1999.12.02"
-- "1999-12-02"
-- >>> t "1999/3/2"
-- "1999-03-02"
-- >>> t "19990302"
-- "1999-03-02"
-- >>> t "2008/2"
-- "2008-02-01"
-- >>> t "0020/2"
-- "0020-02-01"
-- >>> t "1000"
-- "1000-01-01"
-- >>> t "4/2"
-- "2008-04-02"
-- >>> t "2"
-- "2008-11-02"
-- >>> t "January"
-- "2008-01-01"
-- >>> t "feb"
-- "2008-02-01"
-- >>> t "today"
-- "2008-11-26"
-- >>> t "yesterday"
-- "2008-11-25"
-- >>> t "tomorrow"
-- "2008-11-27"
-- >>> t "this day"
-- "2008-11-26"
-- >>> t "last day"
-- "2008-11-25"
-- >>> t "next day"
-- "2008-11-27"
-- >>> t "this week" -- last monday
-- "2008-11-24"
-- >>> t "last week" -- previous monday
-- "2008-11-17"
-- >>> t "next week" -- next monday
-- "2008-12-01"
-- >>> t "this month"
-- "2008-11-01"
-- >>> t "last month"
-- "2008-10-01"
-- >>> t "next month"
-- "2008-12-01"
-- >>> t "this quarter"
-- "2008-10-01"
-- >>> t "last quarter"
-- "2008-07-01"
-- >>> t "next quarter"
-- "2009-01-01"
-- >>> t "this year"
-- "2008-01-01"
-- >>> t "last year"
-- "2007-01-01"
-- >>> t "next year"
-- "2009-01-01"
--
-- t "last wed"
-- "2008-11-19"
-- t "next friday"
-- "2008-11-28"
-- t "next january"
-- "2009-01-01"
--
fixSmartDate :: Day -> SmartDate -> Day
2019-02-14 16:14:52 +03:00
fixSmartDate refdate = fix
where
fix :: SmartDate -> Day
fix (SmartRelative This Day) = refdate
fix (SmartRelative Last Day) = prevday refdate
fix (SmartRelative Next Day) = nextday refdate
fix (SmartRelative This Week) = thisweek refdate
fix (SmartRelative Last Week) = prevweek refdate
fix (SmartRelative Next Week) = nextweek refdate
fix (SmartRelative This Month) = thismonth refdate
fix (SmartRelative Last Month) = prevmonth refdate
fix (SmartRelative Next Month) = nextmonth refdate
fix (SmartRelative This Quarter) = thisquarter refdate
fix (SmartRelative Last Quarter) = prevquarter refdate
fix (SmartRelative Next Quarter) = nextquarter refdate
fix (SmartRelative This Year) = thisyear refdate
fix (SmartRelative Last Year) = prevyear refdate
fix (SmartRelative Next Year) = nextyear refdate
fix (SmartAssumeStart y md) = fromGregorian y (maybe 1 fst md) (fromMaybe 1 $ snd =<< md)
fix (SmartFromReference m d) = fromGregorian ry (fromMaybe rm m) d
fix (SmartMonth m) = fromGregorian ry m 1
(ry, rm, _) = toGregorian refdate
2008-11-27 05:49:22 +03:00
prevday :: Day -> Day
prevday = addDays (-1)
nextday = addDays 1
startofday = id
2008-11-27 04:49:13 +03:00
2008-11-27 05:49:22 +03:00
thisweek = startofweek
prevweek = startofweek . addDays (-7)
nextweek = startofweek . addDays 7
startofweek day = fromMondayStartWeek y w 1
2008-11-27 04:49:13 +03:00
where
2008-11-27 05:49:22 +03:00
(y,_,_) = toGregorian day
2008-11-27 04:49:13 +03:00
(w,_) = mondayStartWeek day
2008-11-27 05:49:22 +03:00
thismonth = startofmonth
prevmonth = startofmonth . addGregorianMonthsClip (-1)
nextmonth = startofmonth . addGregorianMonthsClip 1
startofmonth day = fromGregorian y m 1 where (y,m,_) = toGregorian day
nthdayofmonth d day = fromGregorian y m d where (y,m,_) = toGregorian day
2008-11-27 05:49:22 +03:00
thisquarter = startofquarter
prevquarter = startofquarter . addGregorianMonthsClip (-3)
nextquarter = startofquarter . addGregorianMonthsClip 3
startofquarter day = fromGregorian y (firstmonthofquarter m) 1
where
(y,m,_) = toGregorian day
firstmonthofquarter m = ((m-1) `div` 3) * 3 + 1
thisyear = startofyear
prevyear = startofyear . addGregorianYearsClip (-1)
nextyear = startofyear . addGregorianYearsClip 1
startofyear day = fromGregorian y 1 1 where (y,_,_) = toGregorian day
-- | For given date d find year-long interval that starts on given
-- MM/DD of year and covers it.
-- The given MM and DD should be basically valid (1-12 & 1-31),
-- or an error is raised.
--
-- Examples: lets take 2017-11-22. Year-long intervals covering it that
-- starts before Nov 22 will start in 2017. However
-- intervals that start after Nov 23rd should start in 2016:
-- >>> let wed22nd = fromGregorian 2017 11 22
-- >>> nthdayofyearcontaining 11 21 wed22nd
-- 2017-11-21
-- >>> nthdayofyearcontaining 11 22 wed22nd
-- 2017-11-22
-- >>> nthdayofyearcontaining 11 23 wed22nd
-- 2016-11-23
-- >>> nthdayofyearcontaining 12 02 wed22nd
-- 2016-12-02
-- >>> nthdayofyearcontaining 12 31 wed22nd
-- 2016-12-31
-- >>> nthdayofyearcontaining 1 1 wed22nd
-- 2017-01-01
2018-07-24 16:24:45 +03:00
nthdayofyearcontaining :: Month -> MonthDay -> Day -> Day
nthdayofyearcontaining m md date
-- PARTIAL:
| not (validMonth m) = error' $ "nthdayofyearcontaining: invalid month "++show m
| not (validDay md) = error' $ "nthdayofyearcontaining: invalid day " ++show md
| mmddOfSameYear <= date = mmddOfSameYear
| otherwise = mmddOfPrevYear
where mmddOfSameYear = addDays (toInteger md-1) $ applyN (m-1) nextmonth s
mmddOfPrevYear = addDays (toInteger md-1) $ applyN (m-1) nextmonth $ prevyear s
s = startofyear date
lib: Fix splitSpan for nthdayof{week,month} - start of DateSpan was not covered Demonstration: Consider year-test.journal: ``` 2015/02/01 first half expenses $1 assets 2015/07/01 second half expenses $2 assets 2016/02/01 first half expenses $4 assets 2016/07/01 second half expenses $8 assets 2017/02/01 first half expenses $16 assets 2017/07/01 second half expenses $32 assets ``` Year balances are good: ``` $ hledger balance -f year-test.journal -p yearly Balance changes in 2015/01/01-2017/12/31: || 2015 2016 2017 ==========++================== assets || $-3 $-12 $-48 expenses || $3 $12 $48 ----------++------------------ || 0 0 0 ``` Note how first transaction in 2015 is not included. Note that this is old period expression, so this bug exsits in master: ```$ hledger balance -f year-test.journal -p 'every 2nd day of month' Balance changes in 2015/07/02-2017/07/01: || 2015/07/02-2015/08/01 2015/08/02-2015/09/01 2015/09/02-2015/10/01 2015/10/02-2015/11/01 2015/11/02-2015/12/01 2015/12/02-2016/01/01 2016/01/02-2016/02/01 2016/02/02-2016/03/01 2016/03/02-2016/04/01 2016/04/02-2016/05/01 2016/05/02-2016/06/01 2016/06/02-2016/07/01 2016/07/02-2016/08/01 2016/08/02-2016/09/01 2016/09/02-2016/10/01 2016/10/02-2016/11/01 2016/11/02-2016/12/01 2016/12/02-2017/01/01 2017/01/02-2017/02/01 2017/02/02-2017/03/01 2017/03/02-2017/04/01 2017/04/02-2017/05/01 2017/05/02-2017/06/01 2017/06/02-2017/07/01 ==========++======================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================== assets || 0 0 0 0 0 0 $-4 0 0 0 0 $-8 0 0 0 0 0 0 $-16 0 0 0 0 $-32 expenses || 0 0 0 0 0 0 $4 0 0 0 0 $8 0 0 0 0 0 0 $16 0 0 0 0 $32 ----------++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ || 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ``` Note how 2015 is absent entirely. This is new expression, but i think that general nature of bug is the same... ``` $ hledger balance -f year-test.journal -p 'every 4th Apr' Balance changes in 2016/04/04-2018/04/03: || 2016/04/04-2017/04/03 2017/04/04-2018/04/03 ==========++============================================== assets || $-24 $-32 expenses || $24 $32 ----------++---------------------------------------------- || 0 0 ```
2017-11-25 00:51:51 +03:00
-- | For given date d find month-long interval that starts on nth day of month
-- and covers it.
-- The given day of month should be basically valid (1-31), or an error is raised.
lib: Fix splitSpan for nthdayof{week,month} - start of DateSpan was not covered Demonstration: Consider year-test.journal: ``` 2015/02/01 first half expenses $1 assets 2015/07/01 second half expenses $2 assets 2016/02/01 first half expenses $4 assets 2016/07/01 second half expenses $8 assets 2017/02/01 first half expenses $16 assets 2017/07/01 second half expenses $32 assets ``` Year balances are good: ``` $ hledger balance -f year-test.journal -p yearly Balance changes in 2015/01/01-2017/12/31: || 2015 2016 2017 ==========++================== assets || $-3 $-12 $-48 expenses || $3 $12 $48 ----------++------------------ || 0 0 0 ``` Note how first transaction in 2015 is not included. Note that this is old period expression, so this bug exsits in master: ```$ hledger balance -f year-test.journal -p 'every 2nd day of month' Balance changes in 2015/07/02-2017/07/01: || 2015/07/02-2015/08/01 2015/08/02-2015/09/01 2015/09/02-2015/10/01 2015/10/02-2015/11/01 2015/11/02-2015/12/01 2015/12/02-2016/01/01 2016/01/02-2016/02/01 2016/02/02-2016/03/01 2016/03/02-2016/04/01 2016/04/02-2016/05/01 2016/05/02-2016/06/01 2016/06/02-2016/07/01 2016/07/02-2016/08/01 2016/08/02-2016/09/01 2016/09/02-2016/10/01 2016/10/02-2016/11/01 2016/11/02-2016/12/01 2016/12/02-2017/01/01 2017/01/02-2017/02/01 2017/02/02-2017/03/01 2017/03/02-2017/04/01 2017/04/02-2017/05/01 2017/05/02-2017/06/01 2017/06/02-2017/07/01 ==========++======================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================== assets || 0 0 0 0 0 0 $-4 0 0 0 0 $-8 0 0 0 0 0 0 $-16 0 0 0 0 $-32 expenses || 0 0 0 0 0 0 $4 0 0 0 0 $8 0 0 0 0 0 0 $16 0 0 0 0 $32 ----------++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ || 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ``` Note how 2015 is absent entirely. This is new expression, but i think that general nature of bug is the same... ``` $ hledger balance -f year-test.journal -p 'every 4th Apr' Balance changes in 2016/04/04-2018/04/03: || 2016/04/04-2017/04/03 2017/04/04-2018/04/03 ==========++============================================== assets || $-24 $-32 expenses || $24 $32 ----------++---------------------------------------------- || 0 0 ```
2017-11-25 00:51:51 +03:00
--
-- Examples: lets take 2017-11-22. Month-long intervals covering it that
-- start on 1st-22nd of month will start in Nov. However
-- intervals that start on 23rd-30th of month should start in Oct:
-- >>> let wed22nd = fromGregorian 2017 11 22
lib: Fix splitSpan for nthdayof{week,month} - start of DateSpan was not covered Demonstration: Consider year-test.journal: ``` 2015/02/01 first half expenses $1 assets 2015/07/01 second half expenses $2 assets 2016/02/01 first half expenses $4 assets 2016/07/01 second half expenses $8 assets 2017/02/01 first half expenses $16 assets 2017/07/01 second half expenses $32 assets ``` Year balances are good: ``` $ hledger balance -f year-test.journal -p yearly Balance changes in 2015/01/01-2017/12/31: || 2015 2016 2017 ==========++================== assets || $-3 $-12 $-48 expenses || $3 $12 $48 ----------++------------------ || 0 0 0 ``` Note how first transaction in 2015 is not included. Note that this is old period expression, so this bug exsits in master: ```$ hledger balance -f year-test.journal -p 'every 2nd day of month' Balance changes in 2015/07/02-2017/07/01: || 2015/07/02-2015/08/01 2015/08/02-2015/09/01 2015/09/02-2015/10/01 2015/10/02-2015/11/01 2015/11/02-2015/12/01 2015/12/02-2016/01/01 2016/01/02-2016/02/01 2016/02/02-2016/03/01 2016/03/02-2016/04/01 2016/04/02-2016/05/01 2016/05/02-2016/06/01 2016/06/02-2016/07/01 2016/07/02-2016/08/01 2016/08/02-2016/09/01 2016/09/02-2016/10/01 2016/10/02-2016/11/01 2016/11/02-2016/12/01 2016/12/02-2017/01/01 2017/01/02-2017/02/01 2017/02/02-2017/03/01 2017/03/02-2017/04/01 2017/04/02-2017/05/01 2017/05/02-2017/06/01 2017/06/02-2017/07/01 ==========++======================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================== assets || 0 0 0 0 0 0 $-4 0 0 0 0 $-8 0 0 0 0 0 0 $-16 0 0 0 0 $-32 expenses || 0 0 0 0 0 0 $4 0 0 0 0 $8 0 0 0 0 0 0 $16 0 0 0 0 $32 ----------++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ || 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ``` Note how 2015 is absent entirely. This is new expression, but i think that general nature of bug is the same... ``` $ hledger balance -f year-test.journal -p 'every 4th Apr' Balance changes in 2016/04/04-2018/04/03: || 2016/04/04-2017/04/03 2017/04/04-2018/04/03 ==========++============================================== assets || $-24 $-32 expenses || $24 $32 ----------++---------------------------------------------- || 0 0 ```
2017-11-25 00:51:51 +03:00
-- >>> nthdayofmonthcontaining 1 wed22nd
-- 2017-11-01
lib: Fix splitSpan for nthdayof{week,month} - start of DateSpan was not covered Demonstration: Consider year-test.journal: ``` 2015/02/01 first half expenses $1 assets 2015/07/01 second half expenses $2 assets 2016/02/01 first half expenses $4 assets 2016/07/01 second half expenses $8 assets 2017/02/01 first half expenses $16 assets 2017/07/01 second half expenses $32 assets ``` Year balances are good: ``` $ hledger balance -f year-test.journal -p yearly Balance changes in 2015/01/01-2017/12/31: || 2015 2016 2017 ==========++================== assets || $-3 $-12 $-48 expenses || $3 $12 $48 ----------++------------------ || 0 0 0 ``` Note how first transaction in 2015 is not included. Note that this is old period expression, so this bug exsits in master: ```$ hledger balance -f year-test.journal -p 'every 2nd day of month' Balance changes in 2015/07/02-2017/07/01: || 2015/07/02-2015/08/01 2015/08/02-2015/09/01 2015/09/02-2015/10/01 2015/10/02-2015/11/01 2015/11/02-2015/12/01 2015/12/02-2016/01/01 2016/01/02-2016/02/01 2016/02/02-2016/03/01 2016/03/02-2016/04/01 2016/04/02-2016/05/01 2016/05/02-2016/06/01 2016/06/02-2016/07/01 2016/07/02-2016/08/01 2016/08/02-2016/09/01 2016/09/02-2016/10/01 2016/10/02-2016/11/01 2016/11/02-2016/12/01 2016/12/02-2017/01/01 2017/01/02-2017/02/01 2017/02/02-2017/03/01 2017/03/02-2017/04/01 2017/04/02-2017/05/01 2017/05/02-2017/06/01 2017/06/02-2017/07/01 ==========++======================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================== assets || 0 0 0 0 0 0 $-4 0 0 0 0 $-8 0 0 0 0 0 0 $-16 0 0 0 0 $-32 expenses || 0 0 0 0 0 0 $4 0 0 0 0 $8 0 0 0 0 0 0 $16 0 0 0 0 $32 ----------++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ || 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ``` Note how 2015 is absent entirely. This is new expression, but i think that general nature of bug is the same... ``` $ hledger balance -f year-test.journal -p 'every 4th Apr' Balance changes in 2016/04/04-2018/04/03: || 2016/04/04-2017/04/03 2017/04/04-2018/04/03 ==========++============================================== assets || $-24 $-32 expenses || $24 $32 ----------++---------------------------------------------- || 0 0 ```
2017-11-25 00:51:51 +03:00
-- >>> nthdayofmonthcontaining 12 wed22nd
-- 2017-11-12
lib: Fix splitSpan for nthdayof{week,month} - start of DateSpan was not covered Demonstration: Consider year-test.journal: ``` 2015/02/01 first half expenses $1 assets 2015/07/01 second half expenses $2 assets 2016/02/01 first half expenses $4 assets 2016/07/01 second half expenses $8 assets 2017/02/01 first half expenses $16 assets 2017/07/01 second half expenses $32 assets ``` Year balances are good: ``` $ hledger balance -f year-test.journal -p yearly Balance changes in 2015/01/01-2017/12/31: || 2015 2016 2017 ==========++================== assets || $-3 $-12 $-48 expenses || $3 $12 $48 ----------++------------------ || 0 0 0 ``` Note how first transaction in 2015 is not included. Note that this is old period expression, so this bug exsits in master: ```$ hledger balance -f year-test.journal -p 'every 2nd day of month' Balance changes in 2015/07/02-2017/07/01: || 2015/07/02-2015/08/01 2015/08/02-2015/09/01 2015/09/02-2015/10/01 2015/10/02-2015/11/01 2015/11/02-2015/12/01 2015/12/02-2016/01/01 2016/01/02-2016/02/01 2016/02/02-2016/03/01 2016/03/02-2016/04/01 2016/04/02-2016/05/01 2016/05/02-2016/06/01 2016/06/02-2016/07/01 2016/07/02-2016/08/01 2016/08/02-2016/09/01 2016/09/02-2016/10/01 2016/10/02-2016/11/01 2016/11/02-2016/12/01 2016/12/02-2017/01/01 2017/01/02-2017/02/01 2017/02/02-2017/03/01 2017/03/02-2017/04/01 2017/04/02-2017/05/01 2017/05/02-2017/06/01 2017/06/02-2017/07/01 ==========++======================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================== assets || 0 0 0 0 0 0 $-4 0 0 0 0 $-8 0 0 0 0 0 0 $-16 0 0 0 0 $-32 expenses || 0 0 0 0 0 0 $4 0 0 0 0 $8 0 0 0 0 0 0 $16 0 0 0 0 $32 ----------++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ || 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ``` Note how 2015 is absent entirely. This is new expression, but i think that general nature of bug is the same... ``` $ hledger balance -f year-test.journal -p 'every 4th Apr' Balance changes in 2016/04/04-2018/04/03: || 2016/04/04-2017/04/03 2017/04/04-2018/04/03 ==========++============================================== assets || $-24 $-32 expenses || $24 $32 ----------++---------------------------------------------- || 0 0 ```
2017-11-25 00:51:51 +03:00
-- >>> nthdayofmonthcontaining 22 wed22nd
-- 2017-11-22
lib: Fix splitSpan for nthdayof{week,month} - start of DateSpan was not covered Demonstration: Consider year-test.journal: ``` 2015/02/01 first half expenses $1 assets 2015/07/01 second half expenses $2 assets 2016/02/01 first half expenses $4 assets 2016/07/01 second half expenses $8 assets 2017/02/01 first half expenses $16 assets 2017/07/01 second half expenses $32 assets ``` Year balances are good: ``` $ hledger balance -f year-test.journal -p yearly Balance changes in 2015/01/01-2017/12/31: || 2015 2016 2017 ==========++================== assets || $-3 $-12 $-48 expenses || $3 $12 $48 ----------++------------------ || 0 0 0 ``` Note how first transaction in 2015 is not included. Note that this is old period expression, so this bug exsits in master: ```$ hledger balance -f year-test.journal -p 'every 2nd day of month' Balance changes in 2015/07/02-2017/07/01: || 2015/07/02-2015/08/01 2015/08/02-2015/09/01 2015/09/02-2015/10/01 2015/10/02-2015/11/01 2015/11/02-2015/12/01 2015/12/02-2016/01/01 2016/01/02-2016/02/01 2016/02/02-2016/03/01 2016/03/02-2016/04/01 2016/04/02-2016/05/01 2016/05/02-2016/06/01 2016/06/02-2016/07/01 2016/07/02-2016/08/01 2016/08/02-2016/09/01 2016/09/02-2016/10/01 2016/10/02-2016/11/01 2016/11/02-2016/12/01 2016/12/02-2017/01/01 2017/01/02-2017/02/01 2017/02/02-2017/03/01 2017/03/02-2017/04/01 2017/04/02-2017/05/01 2017/05/02-2017/06/01 2017/06/02-2017/07/01 ==========++======================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================== assets || 0 0 0 0 0 0 $-4 0 0 0 0 $-8 0 0 0 0 0 0 $-16 0 0 0 0 $-32 expenses || 0 0 0 0 0 0 $4 0 0 0 0 $8 0 0 0 0 0 0 $16 0 0 0 0 $32 ----------++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ || 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ``` Note how 2015 is absent entirely. This is new expression, but i think that general nature of bug is the same... ``` $ hledger balance -f year-test.journal -p 'every 4th Apr' Balance changes in 2016/04/04-2018/04/03: || 2016/04/04-2017/04/03 2017/04/04-2018/04/03 ==========++============================================== assets || $-24 $-32 expenses || $24 $32 ----------++---------------------------------------------- || 0 0 ```
2017-11-25 00:51:51 +03:00
-- >>> nthdayofmonthcontaining 23 wed22nd
-- 2017-10-23
lib: Fix splitSpan for nthdayof{week,month} - start of DateSpan was not covered Demonstration: Consider year-test.journal: ``` 2015/02/01 first half expenses $1 assets 2015/07/01 second half expenses $2 assets 2016/02/01 first half expenses $4 assets 2016/07/01 second half expenses $8 assets 2017/02/01 first half expenses $16 assets 2017/07/01 second half expenses $32 assets ``` Year balances are good: ``` $ hledger balance -f year-test.journal -p yearly Balance changes in 2015/01/01-2017/12/31: || 2015 2016 2017 ==========++================== assets || $-3 $-12 $-48 expenses || $3 $12 $48 ----------++------------------ || 0 0 0 ``` Note how first transaction in 2015 is not included. Note that this is old period expression, so this bug exsits in master: ```$ hledger balance -f year-test.journal -p 'every 2nd day of month' Balance changes in 2015/07/02-2017/07/01: || 2015/07/02-2015/08/01 2015/08/02-2015/09/01 2015/09/02-2015/10/01 2015/10/02-2015/11/01 2015/11/02-2015/12/01 2015/12/02-2016/01/01 2016/01/02-2016/02/01 2016/02/02-2016/03/01 2016/03/02-2016/04/01 2016/04/02-2016/05/01 2016/05/02-2016/06/01 2016/06/02-2016/07/01 2016/07/02-2016/08/01 2016/08/02-2016/09/01 2016/09/02-2016/10/01 2016/10/02-2016/11/01 2016/11/02-2016/12/01 2016/12/02-2017/01/01 2017/01/02-2017/02/01 2017/02/02-2017/03/01 2017/03/02-2017/04/01 2017/04/02-2017/05/01 2017/05/02-2017/06/01 2017/06/02-2017/07/01 ==========++======================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================== assets || 0 0 0 0 0 0 $-4 0 0 0 0 $-8 0 0 0 0 0 0 $-16 0 0 0 0 $-32 expenses || 0 0 0 0 0 0 $4 0 0 0 0 $8 0 0 0 0 0 0 $16 0 0 0 0 $32 ----------++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ || 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ``` Note how 2015 is absent entirely. This is new expression, but i think that general nature of bug is the same... ``` $ hledger balance -f year-test.journal -p 'every 4th Apr' Balance changes in 2016/04/04-2018/04/03: || 2016/04/04-2017/04/03 2017/04/04-2018/04/03 ==========++============================================== assets || $-24 $-32 expenses || $24 $32 ----------++---------------------------------------------- || 0 0 ```
2017-11-25 00:51:51 +03:00
-- >>> nthdayofmonthcontaining 30 wed22nd
-- 2017-10-30
2018-07-24 16:24:45 +03:00
nthdayofmonthcontaining :: MonthDay -> Day -> Day
nthdayofmonthcontaining md date
-- PARTIAL:
| not (validDay md) = error' $ "nthdayofmonthcontaining: invalid day " ++show md
| nthOfSameMonth <= date = nthOfSameMonth
| otherwise = nthOfPrevMonth
where nthOfSameMonth = nthdayofmonth md s
nthOfPrevMonth = nthdayofmonth md $ prevmonth s
s = startofmonth date
lib: Fix splitSpan for nthdayof{week,month} - start of DateSpan was not covered Demonstration: Consider year-test.journal: ``` 2015/02/01 first half expenses $1 assets 2015/07/01 second half expenses $2 assets 2016/02/01 first half expenses $4 assets 2016/07/01 second half expenses $8 assets 2017/02/01 first half expenses $16 assets 2017/07/01 second half expenses $32 assets ``` Year balances are good: ``` $ hledger balance -f year-test.journal -p yearly Balance changes in 2015/01/01-2017/12/31: || 2015 2016 2017 ==========++================== assets || $-3 $-12 $-48 expenses || $3 $12 $48 ----------++------------------ || 0 0 0 ``` Note how first transaction in 2015 is not included. Note that this is old period expression, so this bug exsits in master: ```$ hledger balance -f year-test.journal -p 'every 2nd day of month' Balance changes in 2015/07/02-2017/07/01: || 2015/07/02-2015/08/01 2015/08/02-2015/09/01 2015/09/02-2015/10/01 2015/10/02-2015/11/01 2015/11/02-2015/12/01 2015/12/02-2016/01/01 2016/01/02-2016/02/01 2016/02/02-2016/03/01 2016/03/02-2016/04/01 2016/04/02-2016/05/01 2016/05/02-2016/06/01 2016/06/02-2016/07/01 2016/07/02-2016/08/01 2016/08/02-2016/09/01 2016/09/02-2016/10/01 2016/10/02-2016/11/01 2016/11/02-2016/12/01 2016/12/02-2017/01/01 2017/01/02-2017/02/01 2017/02/02-2017/03/01 2017/03/02-2017/04/01 2017/04/02-2017/05/01 2017/05/02-2017/06/01 2017/06/02-2017/07/01 ==========++======================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================== assets || 0 0 0 0 0 0 $-4 0 0 0 0 $-8 0 0 0 0 0 0 $-16 0 0 0 0 $-32 expenses || 0 0 0 0 0 0 $4 0 0 0 0 $8 0 0 0 0 0 0 $16 0 0 0 0 $32 ----------++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ || 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ``` Note how 2015 is absent entirely. This is new expression, but i think that general nature of bug is the same... ``` $ hledger balance -f year-test.journal -p 'every 4th Apr' Balance changes in 2016/04/04-2018/04/03: || 2016/04/04-2017/04/03 2017/04/04-2018/04/03 ==========++============================================== assets || $-24 $-32 expenses || $24 $32 ----------++---------------------------------------------- || 0 0 ```
2017-11-25 00:51:51 +03:00
-- | For given date d find week-long interval that starts on nth day of week
-- and covers it.
lib: Fix splitSpan for nthdayof{week,month} - start of DateSpan was not covered Demonstration: Consider year-test.journal: ``` 2015/02/01 first half expenses $1 assets 2015/07/01 second half expenses $2 assets 2016/02/01 first half expenses $4 assets 2016/07/01 second half expenses $8 assets 2017/02/01 first half expenses $16 assets 2017/07/01 second half expenses $32 assets ``` Year balances are good: ``` $ hledger balance -f year-test.journal -p yearly Balance changes in 2015/01/01-2017/12/31: || 2015 2016 2017 ==========++================== assets || $-3 $-12 $-48 expenses || $3 $12 $48 ----------++------------------ || 0 0 0 ``` Note how first transaction in 2015 is not included. Note that this is old period expression, so this bug exsits in master: ```$ hledger balance -f year-test.journal -p 'every 2nd day of month' Balance changes in 2015/07/02-2017/07/01: || 2015/07/02-2015/08/01 2015/08/02-2015/09/01 2015/09/02-2015/10/01 2015/10/02-2015/11/01 2015/11/02-2015/12/01 2015/12/02-2016/01/01 2016/01/02-2016/02/01 2016/02/02-2016/03/01 2016/03/02-2016/04/01 2016/04/02-2016/05/01 2016/05/02-2016/06/01 2016/06/02-2016/07/01 2016/07/02-2016/08/01 2016/08/02-2016/09/01 2016/09/02-2016/10/01 2016/10/02-2016/11/01 2016/11/02-2016/12/01 2016/12/02-2017/01/01 2017/01/02-2017/02/01 2017/02/02-2017/03/01 2017/03/02-2017/04/01 2017/04/02-2017/05/01 2017/05/02-2017/06/01 2017/06/02-2017/07/01 ==========++======================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================== assets || 0 0 0 0 0 0 $-4 0 0 0 0 $-8 0 0 0 0 0 0 $-16 0 0 0 0 $-32 expenses || 0 0 0 0 0 0 $4 0 0 0 0 $8 0 0 0 0 0 0 $16 0 0 0 0 $32 ----------++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ || 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ``` Note how 2015 is absent entirely. This is new expression, but i think that general nature of bug is the same... ``` $ hledger balance -f year-test.journal -p 'every 4th Apr' Balance changes in 2016/04/04-2018/04/03: || 2016/04/04-2017/04/03 2017/04/04-2018/04/03 ==========++============================================== assets || $-24 $-32 expenses || $24 $32 ----------++---------------------------------------------- || 0 0 ```
2017-11-25 00:51:51 +03:00
--
-- Examples: 2017-11-22 is Wed. Week-long intervals that cover it and
-- start on Mon, Tue or Wed will start in the same week. However
-- intervals that start on Thu or Fri should start in prev week:
-- >>> let wed22nd = fromGregorian 2017 11 22
lib: Fix splitSpan for nthdayof{week,month} - start of DateSpan was not covered Demonstration: Consider year-test.journal: ``` 2015/02/01 first half expenses $1 assets 2015/07/01 second half expenses $2 assets 2016/02/01 first half expenses $4 assets 2016/07/01 second half expenses $8 assets 2017/02/01 first half expenses $16 assets 2017/07/01 second half expenses $32 assets ``` Year balances are good: ``` $ hledger balance -f year-test.journal -p yearly Balance changes in 2015/01/01-2017/12/31: || 2015 2016 2017 ==========++================== assets || $-3 $-12 $-48 expenses || $3 $12 $48 ----------++------------------ || 0 0 0 ``` Note how first transaction in 2015 is not included. Note that this is old period expression, so this bug exsits in master: ```$ hledger balance -f year-test.journal -p 'every 2nd day of month' Balance changes in 2015/07/02-2017/07/01: || 2015/07/02-2015/08/01 2015/08/02-2015/09/01 2015/09/02-2015/10/01 2015/10/02-2015/11/01 2015/11/02-2015/12/01 2015/12/02-2016/01/01 2016/01/02-2016/02/01 2016/02/02-2016/03/01 2016/03/02-2016/04/01 2016/04/02-2016/05/01 2016/05/02-2016/06/01 2016/06/02-2016/07/01 2016/07/02-2016/08/01 2016/08/02-2016/09/01 2016/09/02-2016/10/01 2016/10/02-2016/11/01 2016/11/02-2016/12/01 2016/12/02-2017/01/01 2017/01/02-2017/02/01 2017/02/02-2017/03/01 2017/03/02-2017/04/01 2017/04/02-2017/05/01 2017/05/02-2017/06/01 2017/06/02-2017/07/01 ==========++======================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================== assets || 0 0 0 0 0 0 $-4 0 0 0 0 $-8 0 0 0 0 0 0 $-16 0 0 0 0 $-32 expenses || 0 0 0 0 0 0 $4 0 0 0 0 $8 0 0 0 0 0 0 $16 0 0 0 0 $32 ----------++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ || 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ``` Note how 2015 is absent entirely. This is new expression, but i think that general nature of bug is the same... ``` $ hledger balance -f year-test.journal -p 'every 4th Apr' Balance changes in 2016/04/04-2018/04/03: || 2016/04/04-2017/04/03 2017/04/04-2018/04/03 ==========++============================================== assets || $-24 $-32 expenses || $24 $32 ----------++---------------------------------------------- || 0 0 ```
2017-11-25 00:51:51 +03:00
-- >>> nthdayofweekcontaining 1 wed22nd
-- 2017-11-20
lib: Fix splitSpan for nthdayof{week,month} - start of DateSpan was not covered Demonstration: Consider year-test.journal: ``` 2015/02/01 first half expenses $1 assets 2015/07/01 second half expenses $2 assets 2016/02/01 first half expenses $4 assets 2016/07/01 second half expenses $8 assets 2017/02/01 first half expenses $16 assets 2017/07/01 second half expenses $32 assets ``` Year balances are good: ``` $ hledger balance -f year-test.journal -p yearly Balance changes in 2015/01/01-2017/12/31: || 2015 2016 2017 ==========++================== assets || $-3 $-12 $-48 expenses || $3 $12 $48 ----------++------------------ || 0 0 0 ``` Note how first transaction in 2015 is not included. Note that this is old period expression, so this bug exsits in master: ```$ hledger balance -f year-test.journal -p 'every 2nd day of month' Balance changes in 2015/07/02-2017/07/01: || 2015/07/02-2015/08/01 2015/08/02-2015/09/01 2015/09/02-2015/10/01 2015/10/02-2015/11/01 2015/11/02-2015/12/01 2015/12/02-2016/01/01 2016/01/02-2016/02/01 2016/02/02-2016/03/01 2016/03/02-2016/04/01 2016/04/02-2016/05/01 2016/05/02-2016/06/01 2016/06/02-2016/07/01 2016/07/02-2016/08/01 2016/08/02-2016/09/01 2016/09/02-2016/10/01 2016/10/02-2016/11/01 2016/11/02-2016/12/01 2016/12/02-2017/01/01 2017/01/02-2017/02/01 2017/02/02-2017/03/01 2017/03/02-2017/04/01 2017/04/02-2017/05/01 2017/05/02-2017/06/01 2017/06/02-2017/07/01 ==========++======================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================== assets || 0 0 0 0 0 0 $-4 0 0 0 0 $-8 0 0 0 0 0 0 $-16 0 0 0 0 $-32 expenses || 0 0 0 0 0 0 $4 0 0 0 0 $8 0 0 0 0 0 0 $16 0 0 0 0 $32 ----------++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ || 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ``` Note how 2015 is absent entirely. This is new expression, but i think that general nature of bug is the same... ``` $ hledger balance -f year-test.journal -p 'every 4th Apr' Balance changes in 2016/04/04-2018/04/03: || 2016/04/04-2017/04/03 2017/04/04-2018/04/03 ==========++============================================== assets || $-24 $-32 expenses || $24 $32 ----------++---------------------------------------------- || 0 0 ```
2017-11-25 00:51:51 +03:00
-- >>> nthdayofweekcontaining 2 wed22nd
-- 2017-11-21
-- >>> nthdayofweekcontaining 3 wed22nd
-- 2017-11-22
lib: Fix splitSpan for nthdayof{week,month} - start of DateSpan was not covered Demonstration: Consider year-test.journal: ``` 2015/02/01 first half expenses $1 assets 2015/07/01 second half expenses $2 assets 2016/02/01 first half expenses $4 assets 2016/07/01 second half expenses $8 assets 2017/02/01 first half expenses $16 assets 2017/07/01 second half expenses $32 assets ``` Year balances are good: ``` $ hledger balance -f year-test.journal -p yearly Balance changes in 2015/01/01-2017/12/31: || 2015 2016 2017 ==========++================== assets || $-3 $-12 $-48 expenses || $3 $12 $48 ----------++------------------ || 0 0 0 ``` Note how first transaction in 2015 is not included. Note that this is old period expression, so this bug exsits in master: ```$ hledger balance -f year-test.journal -p 'every 2nd day of month' Balance changes in 2015/07/02-2017/07/01: || 2015/07/02-2015/08/01 2015/08/02-2015/09/01 2015/09/02-2015/10/01 2015/10/02-2015/11/01 2015/11/02-2015/12/01 2015/12/02-2016/01/01 2016/01/02-2016/02/01 2016/02/02-2016/03/01 2016/03/02-2016/04/01 2016/04/02-2016/05/01 2016/05/02-2016/06/01 2016/06/02-2016/07/01 2016/07/02-2016/08/01 2016/08/02-2016/09/01 2016/09/02-2016/10/01 2016/10/02-2016/11/01 2016/11/02-2016/12/01 2016/12/02-2017/01/01 2017/01/02-2017/02/01 2017/02/02-2017/03/01 2017/03/02-2017/04/01 2017/04/02-2017/05/01 2017/05/02-2017/06/01 2017/06/02-2017/07/01 ==========++======================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================== assets || 0 0 0 0 0 0 $-4 0 0 0 0 $-8 0 0 0 0 0 0 $-16 0 0 0 0 $-32 expenses || 0 0 0 0 0 0 $4 0 0 0 0 $8 0 0 0 0 0 0 $16 0 0 0 0 $32 ----------++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ || 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ``` Note how 2015 is absent entirely. This is new expression, but i think that general nature of bug is the same... ``` $ hledger balance -f year-test.journal -p 'every 4th Apr' Balance changes in 2016/04/04-2018/04/03: || 2016/04/04-2017/04/03 2017/04/04-2018/04/03 ==========++============================================== assets || $-24 $-32 expenses || $24 $32 ----------++---------------------------------------------- || 0 0 ```
2017-11-25 00:51:51 +03:00
-- >>> nthdayofweekcontaining 4 wed22nd
-- 2017-11-16
lib: Fix splitSpan for nthdayof{week,month} - start of DateSpan was not covered Demonstration: Consider year-test.journal: ``` 2015/02/01 first half expenses $1 assets 2015/07/01 second half expenses $2 assets 2016/02/01 first half expenses $4 assets 2016/07/01 second half expenses $8 assets 2017/02/01 first half expenses $16 assets 2017/07/01 second half expenses $32 assets ``` Year balances are good: ``` $ hledger balance -f year-test.journal -p yearly Balance changes in 2015/01/01-2017/12/31: || 2015 2016 2017 ==========++================== assets || $-3 $-12 $-48 expenses || $3 $12 $48 ----------++------------------ || 0 0 0 ``` Note how first transaction in 2015 is not included. Note that this is old period expression, so this bug exsits in master: ```$ hledger balance -f year-test.journal -p 'every 2nd day of month' Balance changes in 2015/07/02-2017/07/01: || 2015/07/02-2015/08/01 2015/08/02-2015/09/01 2015/09/02-2015/10/01 2015/10/02-2015/11/01 2015/11/02-2015/12/01 2015/12/02-2016/01/01 2016/01/02-2016/02/01 2016/02/02-2016/03/01 2016/03/02-2016/04/01 2016/04/02-2016/05/01 2016/05/02-2016/06/01 2016/06/02-2016/07/01 2016/07/02-2016/08/01 2016/08/02-2016/09/01 2016/09/02-2016/10/01 2016/10/02-2016/11/01 2016/11/02-2016/12/01 2016/12/02-2017/01/01 2017/01/02-2017/02/01 2017/02/02-2017/03/01 2017/03/02-2017/04/01 2017/04/02-2017/05/01 2017/05/02-2017/06/01 2017/06/02-2017/07/01 ==========++======================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================== assets || 0 0 0 0 0 0 $-4 0 0 0 0 $-8 0 0 0 0 0 0 $-16 0 0 0 0 $-32 expenses || 0 0 0 0 0 0 $4 0 0 0 0 $8 0 0 0 0 0 0 $16 0 0 0 0 $32 ----------++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ || 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ``` Note how 2015 is absent entirely. This is new expression, but i think that general nature of bug is the same... ``` $ hledger balance -f year-test.journal -p 'every 4th Apr' Balance changes in 2016/04/04-2018/04/03: || 2016/04/04-2017/04/03 2017/04/04-2018/04/03 ==========++============================================== assets || $-24 $-32 expenses || $24 $32 ----------++---------------------------------------------- || 0 0 ```
2017-11-25 00:51:51 +03:00
-- >>> nthdayofweekcontaining 5 wed22nd
-- 2017-11-17
2018-07-24 16:24:45 +03:00
nthdayofweekcontaining :: WeekDay -> Day -> Day
lib: Fix splitSpan for nthdayof{week,month} - start of DateSpan was not covered Demonstration: Consider year-test.journal: ``` 2015/02/01 first half expenses $1 assets 2015/07/01 second half expenses $2 assets 2016/02/01 first half expenses $4 assets 2016/07/01 second half expenses $8 assets 2017/02/01 first half expenses $16 assets 2017/07/01 second half expenses $32 assets ``` Year balances are good: ``` $ hledger balance -f year-test.journal -p yearly Balance changes in 2015/01/01-2017/12/31: || 2015 2016 2017 ==========++================== assets || $-3 $-12 $-48 expenses || $3 $12 $48 ----------++------------------ || 0 0 0 ``` Note how first transaction in 2015 is not included. Note that this is old period expression, so this bug exsits in master: ```$ hledger balance -f year-test.journal -p 'every 2nd day of month' Balance changes in 2015/07/02-2017/07/01: || 2015/07/02-2015/08/01 2015/08/02-2015/09/01 2015/09/02-2015/10/01 2015/10/02-2015/11/01 2015/11/02-2015/12/01 2015/12/02-2016/01/01 2016/01/02-2016/02/01 2016/02/02-2016/03/01 2016/03/02-2016/04/01 2016/04/02-2016/05/01 2016/05/02-2016/06/01 2016/06/02-2016/07/01 2016/07/02-2016/08/01 2016/08/02-2016/09/01 2016/09/02-2016/10/01 2016/10/02-2016/11/01 2016/11/02-2016/12/01 2016/12/02-2017/01/01 2017/01/02-2017/02/01 2017/02/02-2017/03/01 2017/03/02-2017/04/01 2017/04/02-2017/05/01 2017/05/02-2017/06/01 2017/06/02-2017/07/01 ==========++======================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================== assets || 0 0 0 0 0 0 $-4 0 0 0 0 $-8 0 0 0 0 0 0 $-16 0 0 0 0 $-32 expenses || 0 0 0 0 0 0 $4 0 0 0 0 $8 0 0 0 0 0 0 $16 0 0 0 0 $32 ----------++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ || 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ``` Note how 2015 is absent entirely. This is new expression, but i think that general nature of bug is the same... ``` $ hledger balance -f year-test.journal -p 'every 4th Apr' Balance changes in 2016/04/04-2018/04/03: || 2016/04/04-2017/04/03 2017/04/04-2018/04/03 ==========++============================================== assets || $-24 $-32 expenses || $24 $32 ----------++---------------------------------------------- || 0 0 ```
2017-11-25 00:51:51 +03:00
nthdayofweekcontaining n d | nthOfSameWeek <= d = nthOfSameWeek
| otherwise = nthOfPrevWeek
where nthOfSameWeek = addDays (toInteger n-1) s
nthOfPrevWeek = addDays (toInteger n-1) $ prevweek s
s = startofweek d
-- | For given date d find month-long interval that starts on nth weekday of month
-- and covers it.
--
-- Examples: 2017-11-22 is 3rd Wed of Nov. Month-long intervals that cover it and
-- start on 1st-4th Wed will start in Nov. However
-- intervals that start on 4th Thu or Fri or later should start in Oct:
-- >>> let wed22nd = fromGregorian 2017 11 22
-- >>> nthweekdayofmonthcontaining 1 3 wed22nd
-- 2017-11-01
-- >>> nthweekdayofmonthcontaining 3 2 wed22nd
-- 2017-11-21
-- >>> nthweekdayofmonthcontaining 4 3 wed22nd
-- 2017-11-22
-- >>> nthweekdayofmonthcontaining 4 4 wed22nd
-- 2017-10-26
-- >>> nthweekdayofmonthcontaining 4 5 wed22nd
-- 2017-10-27
2018-07-24 16:24:45 +03:00
nthweekdayofmonthcontaining :: Int -> WeekDay -> Day -> Day
nthweekdayofmonthcontaining n wd d | nthWeekdaySameMonth <= d = nthWeekdaySameMonth
| otherwise = nthWeekdayPrevMonth
where nthWeekdaySameMonth = advancetonthweekday n wd $ startofmonth d
nthWeekdayPrevMonth = advancetonthweekday n wd $ prevmonth d
2018-07-24 16:24:45 +03:00
-- | Advance to nth weekday wd after given start day s
-- Can call error.
2018-07-24 16:24:45 +03:00
advancetonthweekday :: Int -> WeekDay -> Day -> Day
advancetonthweekday n wd s =
-- PARTIAL:
maybe err (addWeeks (n-1)) $ firstMatch (>=s) $ iterate (addWeeks 1) $ firstweekday s
where
err = error' "advancetonthweekday: should not happen"
addWeeks k = addDays (7 * toInteger k)
firstMatch p = headMay . dropWhile (not . p)
firstweekday = addDays (toInteger wd-1) . startofweek
----------------------------------------------------------------------
-- parsing
2012-05-07 00:42:34 +04:00
-- -- | Parse a couple of date-time string formats to a time type.
-- parsedatetimeM :: String -> Maybe LocalTime
-- parsedatetimeM s = asum [
2012-05-07 00:42:34 +04:00
-- parseTime defaultTimeLocale "%Y/%m/%d %H:%M:%S" s,
-- parseTime defaultTimeLocale "%Y-%m-%d %H:%M:%S" s
-- ]
-- | Try to parse a couple of date string formats:
-- `YYYY-MM-DD`, `YYYY/MM/DD` or `YYYY.MM.DD`, with leading zeros required.
-- For internal use, not quite the same as the journal's "simple dates".
-- >>> parsedateM "2008/02/03"
-- Just 2008-02-03
-- >>> parsedateM "2008/02/03/"
-- Nothing
-- >>> parsedateM "2008/02/30"
-- Nothing
parsedateM :: String -> Maybe Day
parsedateM s = asum [
parseTimeM True defaultTimeLocale "%Y-%m-%d" s,
parseTimeM True defaultTimeLocale "%Y/%m/%d" s,
parseTimeM True defaultTimeLocale "%Y.%m.%d" s
]
{-|
Parse a date in any of the formats allowed in Ledger's period expressions, and some others.
Assumes any text in the parse stream has been lowercased.
Returns a SmartDate, to be converted to a full date later (see fixSmartDate).
Examples:
> 2004 (start of year, which must have 4+ digits)
> 2004/10 (start of month, which must be 1-12)
> 2004/10/1 (exact date, day must be 1-31)
> 10/1 (month and day in current year)
> 21 (day in current month)
> october, oct (start of month in current year)
> yesterday, today, tomorrow (-1, 0, 1 days from today)
> last/this/next day/week/month/quarter/year (-1, 0, 1 periods from the current period)
> 20181201 (8 digit YYYYMMDD with valid year month and day)
> 201812 (6 digit YYYYMM with valid year and month)
Note malformed digit sequences might give surprising results:
> 201813 (6 digits with an invalid month is parsed as start of 6-digit year)
> 20181301 (8 digits with an invalid month is parsed as start of 8-digit year)
> 20181232 (8 digits with an invalid day gives an error)
> 201801012 (9+ digits beginning with a valid YYYYMMDD gives an error)
Eg:
YYYYMMDD is parsed as year-month-date if those parts are valid
(>=4 digits, 1-12, and 1-31 respectively):
>>> parsewith (smartdate <* eof) "20181201"
Right (SmartAssumeStart 2018 (Just (12,Just 1)))
YYYYMM is parsed as year-month-01 if year and month are valid:
>>> parsewith (smartdate <* eof) "201804"
Right (SmartAssumeStart 2018 (Just (4,Nothing)))
With an invalid month, it's parsed as a year:
>>> parsewith (smartdate <* eof) "201813"
Right (SmartAssumeStart 201813 Nothing)
A 9+ digit number beginning with valid YYYYMMDD gives an error:
>>> parsewith (smartdate <* eof) "201801012"
2018-05-13 18:10:45 +03:00
Left (...)
Big numbers not beginning with a valid YYYYMMDD are parsed as a year:
>>> parsewith (smartdate <* eof) "201813012"
Right (SmartAssumeStart 201813012 Nothing)
-}
smartdate :: TextParser m SmartDate
smartdate = choice'
-- XXX maybe obscures date errors ? see ledgerdate
[ yyyymmdd, ymd
, (\(m,d) -> SmartFromReference (Just m) d) <$> md
, (SmartFromReference Nothing <$> decimal) >>= failIfInvalidDate
, SmartMonth <$> (month <|> mon)
, SmartRelative This Day <$ string' "today"
, SmartRelative Last Day <$ string' "yesterday"
, SmartRelative Next Day <$ string' "tomorrow"
, liftA2 SmartRelative (seqP <* skipNonNewlineSpaces) intervalP
]
where
seqP = choice [This <$ string' "this", Last <$ string' "last", Next <$ string' "next"]
intervalP = choice [Day <$ string' "day", Week <$ string' "week", Month <$ string' "month",
Quarter <$ string' "quarter", Year <$ string' "year"]
-- | Like smartdate, but there must be nothing other than whitespace after the date.
smartdateonly :: TextParser m SmartDate
smartdateonly = smartdate <* skipNonNewlineSpaces <* eof
2019-02-14 16:14:52 +03:00
datesepchars :: String
datesepchars = "/-."
datesepchar :: TextParser m Char
datesepchar = satisfy isDateSepChar
isDateSepChar :: Char -> Bool
isDateSepChar c = c == '-' || c == '/' || c == '.'
validMonth, validDay :: Int -> Bool
validMonth n = n >= 1 && n <= 12
validDay n = n >= 1 && n <= 31
failIfInvalidDate :: Fail.MonadFail m => SmartDate -> m SmartDate
failIfInvalidDate s = unless isValid (Fail.fail $ "bad smart date: " ++ show s) *> return s
where isValid = case s of
SmartAssumeStart y (Just (m, md)) -> isJust $ fromGregorianValid y m (fromMaybe 1 md)
SmartFromReference mm d -> isJust $ fromGregorianValid 2004 (fromMaybe 1 mm) d
SmartMonth m -> validMonth m
_ -> True
yyyymmdd :: TextParser m SmartDate
yyyymmdd = do
y <- read <$> count 4 digitChar
m <- read <$> count 2 digitChar
d <- optional $ read <$> count 2 digitChar
let date = SmartAssumeStart y $ Just (m, d)
failIfInvalidDate date
ymd :: TextParser m SmartDate
ymd = do
y <- yearp
fmap (SmartAssumeStart y) . optional . try $ do
sep <- datesepchar
m <- decimal
unless (validMonth m) $ Fail.fail ("Bad month " <> show m)
fmap (m,) . optional . try $ do
_ <- char sep
d <- decimal
failIfInvalidDate $ SmartAssumeStart y (Just (m, Just d))
return d
md :: TextParser m (Month, MonthDay)
md = do
m <- decimal
datesepchar
d <- decimal
_ <- failIfInvalidDate $ SmartFromReference (Just m) d
return (m, d)
-- | Parse a year number from a Text, making sure that at least four digits are
-- used.
yearp :: TextParser m Integer
yearp = do
year <- takeWhile1P (Just "year") isDigit
unless (T.length year >= 4) . Fail.fail $ "Year must contain at least 4 digits: " <> T.unpack year
return $ readDecimal year
-- These are compared case insensitively, and should all be kept lower case.
months = ["january","february","march","april","may","june",
"july","august","september","october","november","december"]
monthabbrevs = ["jan","feb","mar","apr","may","jun","jul","aug","sep","oct","nov","dec"]
weekdays = ["monday","tuesday","wednesday","thursday","friday","saturday","sunday"]
weekdayabbrevs = ["mon","tue","wed","thu","fri","sat","sun"]
month, mon :: TextParser m Month
month = choice $ zipWith (\i m -> i <$ string' m) [1..12] months
mon = choice $ zipWith (\i m -> i <$ string' m) [1..12] monthabbrevs
weekday :: TextParser m Int
weekday = do
wday <- T.toLower <$> (choice . map string' $ weekdays ++ weekdayabbrevs)
case catMaybes $ [wday `elemIndex` weekdays, wday `elemIndex` weekdayabbrevs] of
(i:_) -> return (i+1)
[] -> Fail.fail $ "weekday: should not happen: attempted to find " <>
show wday <> " in " <> show (weekdays ++ weekdayabbrevs)
-- | Parse a period expression, specifying a date span and optionally
-- a reporting interval. Requires a reference "today" date for
-- resolving any relative start/end dates (only; it is not needed for
-- parsing the reporting interval).
--
-- >>> let p = parsePeriodExpr (fromGregorian 2008 11 26)
-- >>> p "from Aug to Oct"
-- Right (NoInterval,DateSpan 2008-08-01..2008-09-30)
-- >>> p "aug to oct"
-- Right (NoInterval,DateSpan 2008-08-01..2008-09-30)
2020-07-31 17:35:27 +03:00
-- >>> p "2009q2"
-- Right (NoInterval,DateSpan 2009Q2)
-- >>> p "Q3"
-- Right (NoInterval,DateSpan 2008Q3)
-- >>> p "every 3 days in Aug"
-- Right (Days 3,DateSpan 2008-08)
-- >>> p "daily from aug"
-- Right (Days 1,DateSpan 2008-08-01..)
-- >>> p "every week to 2009"
-- Right (Weeks 1,DateSpan ..2008-12-31)
-- >>> p "every 2nd day of month"
-- Right (DayOfMonth 2,DateSpan ..)
-- >>> p "every 2nd day"
-- Right (DayOfMonth 2,DateSpan ..)
-- >>> p "every 2nd day 2009.."
-- Right (DayOfMonth 2,DateSpan 2009-01-01..)
-- >>> p "every 2nd day 2009-"
-- Right (DayOfMonth 2,DateSpan 2009-01-01..)
-- >>> p "every 29th Nov"
-- Right (DayOfYear 11 29,DateSpan ..)
-- >>> p "every 29th nov ..2009"
-- Right (DayOfYear 11 29,DateSpan ..2008-12-31)
-- >>> p "every nov 29th"
-- Right (DayOfYear 11 29,DateSpan ..)
-- >>> p "every Nov 29th 2009.."
-- Right (DayOfYear 11 29,DateSpan 2009-01-01..)
-- >>> p "every 11/29 from 2009"
-- Right (DayOfYear 11 29,DateSpan 2009-01-01..)
-- >>> p "every 2nd Thursday of month to 2009"
-- Right (WeekdayOfMonth 2 4,DateSpan ..2008-12-31)
-- >>> p "every 1st monday of month to 2009"
-- Right (WeekdayOfMonth 1 1,DateSpan ..2008-12-31)
-- >>> p "every tue"
-- Right (DayOfWeek 2,DateSpan ..)
-- >>> p "every 2nd day of week"
-- Right (DayOfWeek 2,DateSpan ..)
-- >>> p "every 2nd day of month"
-- Right (DayOfMonth 2,DateSpan ..)
-- >>> p "every 2nd day"
-- Right (DayOfMonth 2,DateSpan ..)
-- >>> p "every 2nd day 2009.."
-- Right (DayOfMonth 2,DateSpan 2009-01-01..)
-- >>> p "every 2nd day of month 2009.."
-- Right (DayOfMonth 2,DateSpan 2009-01-01..)
periodexprp :: Day -> TextParser m (Interval, DateSpan)
periodexprp rdate = do
skipNonNewlineSpaces
choice' [ intervalanddateperiodexprp rdate
, (,) NoInterval <$> periodexprdatespanp rdate
]
-- Parse a reporting interval and a date span.
intervalanddateperiodexprp :: Day -> TextParser m (Interval, DateSpan)
intervalanddateperiodexprp rdate = do
i <- reportingintervalp
s <- option def . try $ do
skipNonNewlineSpaces
periodexprdatespanp rdate
return (i,s)
-- Parse a reporting interval.
reportingintervalp :: TextParser m Interval
reportingintervalp = choice'
[ tryinterval "day" "daily" Days
, tryinterval "week" "weekly" Weeks
, tryinterval "month" "monthly" Months
, tryinterval "quarter" "quarterly" Quarters
, tryinterval "year" "yearly" Years
, Weeks 2 <$ string' "biweekly"
, Weeks 2 <$ string' "fortnightly"
, Months 2 <$ string' "bimonthly"
, string' "every" *> skipNonNewlineSpaces *> choice'
[ DayOfWeek <$> (nth <* skipNonNewlineSpaces <* string' "day" <* of_ "week")
, DayOfMonth <$> (nth <* skipNonNewlineSpaces <* string' "day" <* optOf_ "month")
, liftA2 WeekdayOfMonth nth $ skipNonNewlineSpaces *> weekday <* optOf_ "month"
, uncurry DayOfYear <$> (md <* optOf_ "year")
, DayOfWeek <$> weekday
, d_o_y <* optOf_ "year"
]
]
where
of_ period =
skipNonNewlineSpaces *> string' "of" *> skipNonNewlineSpaces *> string' period
optOf_ period = optional . try $ of_ period
nth = decimal <* choice (map string' ["st","nd","rd","th"])
d_o_y = runPermutation $ liftA2 DayOfYear (toPermutation $ (month <|> mon) <* skipNonNewlineSpaces)
(toPermutation $ nth <* skipNonNewlineSpaces)
-- Parse any of several variants of a basic interval, eg "daily", "every day", "every N days".
tryinterval :: String -> String -> (Int -> Interval) -> TextParser m Interval
tryinterval singular compact intcons = intcons <$> choice'
[ 1 <$ string' compact'
, string' "every" *> skipNonNewlineSpaces *> choice
[ 1 <$ string' singular'
, decimal <* skipNonNewlineSpaces <* string' plural'
]
]
where
compact' = T.pack compact
singular' = T.pack singular
plural' = T.pack $ singular ++ "s"
periodexprdatespanp :: Day -> TextParser m DateSpan
periodexprdatespanp rdate = choice $ map try [
doubledatespanp rdate,
2020-07-31 17:35:27 +03:00
quarterdatespanp rdate,
fromdatespanp rdate,
todatespanp rdate,
justdatespanp rdate
]
-- |
-- >>> parsewith (doubledatespanp (fromGregorian 2018 01 01) <* eof) "20180101-201804"
-- Right DateSpan 2018Q1
-- >>> parsewith (doubledatespanp (fromGregorian 2018 01 01) <* eof) "2017..2018"
-- Right DateSpan 2017
-- >>> parsewith (doubledatespanp (fromGregorian 2018 01 01) <* eof) "2017-2018"
-- Right DateSpan 2017
-- >>> parsewith (doubledatespanp (fromGregorian 2018 01 01) <* eof) "2017-01-2018"
-- Right DateSpan 2017
-- >>> parsewith (doubledatespanp (fromGregorian 2018 01 01) <* eof) "2017-01-01-2018"
-- Right DateSpan 2017
doubledatespanp :: Day -> TextParser m DateSpan
doubledatespanp rdate = liftA2 fromToSpan
(optional (string' "from" *> skipNonNewlineSpaces) *> smartdate)
(skipNonNewlineSpaces *> choice [string' "to", string "..", string "-"]
*> skipNonNewlineSpaces *> smartdate)
where
fromToSpan = DateSpan `on` (Just . fixSmartDate rdate)
2020-07-31 17:35:27 +03:00
-- |
-- >>> parsewith (quarterdatespanp (fromGregorian 2018 01 01) <* eof) "q1"
2020-07-31 17:35:27 +03:00
-- Right DateSpan 2018Q1
-- >>> parsewith (quarterdatespanp (fromGregorian 2018 01 01) <* eof) "Q1"
-- Right DateSpan 2018Q1
-- >>> parsewith (quarterdatespanp (fromGregorian 2018 01 01) <* eof) "2020q4"
2020-07-31 17:35:27 +03:00
-- Right DateSpan 2020Q4
quarterdatespanp :: Day -> TextParser m DateSpan
quarterdatespanp rdate = do
y <- yearp <|> pure (first3 $ toGregorian rdate)
q <- char' 'q' *> satisfy is4Digit
return . periodAsDateSpan $ QuarterPeriod y (digitToInt q)
where
is4Digit c = (fromIntegral (ord c - ord '1') :: Word) <= 3
2020-07-31 17:35:27 +03:00
fromdatespanp :: Day -> TextParser m DateSpan
fromdatespanp rdate = fromSpan <$> choice
[ string' "from" *> skipNonNewlineSpaces *> smartdate
, smartdate <* choice [string "..", string "-"]
]
where
fromSpan b = DateSpan (Just $ fixSmartDate rdate b) Nothing
todatespanp :: Day -> TextParser m DateSpan
todatespanp rdate =
choice [string' "to", string' "until", string "..", string "-"]
*> skipNonNewlineSpaces
*> (DateSpan Nothing . Just . fixSmartDate rdate <$> smartdate)
justdatespanp :: Day -> TextParser m DateSpan
justdatespanp rdate =
optional (string' "in" *> skipNonNewlineSpaces)
*> (spanFromSmartDate rdate <$> smartdate)
2011-06-14 23:10:16 +04:00
nulldatespan :: DateSpan
nulldatespan = DateSpan Nothing Nothing
-- | A datespan of zero length, that matches no date.
emptydatespan :: DateSpan
emptydatespan = DateSpan (Just $ addDays 1 nulldate) (Just nulldate)
2011-06-14 23:10:16 +04:00
nulldate :: Day
nulldate = fromGregorian 0 1 1