Skip to content

Added support for new Datetime Constants #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ari24-cb24 merged 2 commits into from
Mar 24, 2022
Merged

Added support for new Datetime Constants #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79dfad0
Added support for new datetimeconstants
Ari24-cb24 Mar 24, 2022
4056378
Fixed new Datetime Constants not being supported in Relative Datetime…
Ari24-cb24 Mar 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion datetimeparser/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ class DatetimeConstants:
GIGAANNUMS = Constant('gigaannuums', ['gigaannuum']) # 1,000,000,000 years

TIME = [SECONDS, MINUTES, QUARTERS, HOURS]
DATE = [DAYS, WEEKS, MONTHS, YEARS, DECADES, CENTURIES, MILLENNIUMS]
DATE = [DAYS, WEEKS, MONTHS, YEARS, DECADES, CENTURIES, MILLENNIUMS, MEGAANNUMS, GIGAANNUMS]
ALL = [*DATE, *TIME]

@classmethod
Expand Down
29 changes: 13 additions & 16 deletions datetimeparser/parsermethods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,16 @@ def from_keyword(keyword: Constant, delta: int = 1) -> RelativeDateTime:
return RelativeDateTime(months=delta)
elif keyword == DatetimeConstants.YEARS:
return RelativeDateTime(years=delta)
elif keyword == DatetimeConstants.OLYMPIADS:
return RelativeDateTime(years=4)
elif keyword == DatetimeConstants.CENTURIES:
return RelativeDateTime(years=100)
elif keyword == DatetimeConstants.MILLENNIUMS:
return RelativeDateTime(years=1000)
elif keyword == DatetimeConstants.MEGAANNUMS:
return RelativeDateTime(years=1000000)
elif keyword == DatetimeConstants.GIGAANNUMS:
return RelativeDateTime(years=1000000000)
elif keyword == DatetimeConstants.HOURS:
return RelativeDateTime(hours=delta)
elif keyword == DatetimeConstants.QUARTERS:
Expand Down Expand Up @@ -205,22 +215,9 @@ def parse(self, string: str) -> Union[None, Tuple[MethodEnum, RelativeDateTime]]
number = new_data.pop(0)
type_ = new_data.pop(0)

if type_ in DatetimeConstants.DATE:
if type_ == DatetimeConstants.DAYS:
date.days = number
elif type_ == DatetimeConstants.WEEKS:
date.weeks = number
elif type_ == DatetimeConstants.MONTHS:
date.months = number
elif type_ == DatetimeConstants.YEARS:
date.years = number
elif type_ in DatetimeConstants.TIME:
if type_ == DatetimeConstants.SECONDS:
date.seconds = number
elif type_ == DatetimeConstants.MINUTES:
date.minutes = number
elif type_ == DatetimeConstants.HOURS:
date.hours = number
if type_ in DatetimeConstants.ALL:
relative_date = RelativeDatetimeHelper.from_keyword(type_, number)
date = RelativeDateTime.concatenate(relative_date, date)

return Method.RELATIVE_DATETIMES, date

Expand Down