From 16a9b29cdf7c04e96b0f3914f8953589902bfee2 Mon Sep 17 00:00:00 2001 From: nicfb Date: Thu, 3 Nov 2022 23:34:46 -0700 Subject: [PATCH] Rename 'from' to 'until' Make today default search start date --- kosmorro/__main__.py | 16 ++++++++-------- kosmorro/exceptions.py | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kosmorro/__main__.py b/kosmorro/__main__.py index 18465a9f..ee8cee28 100644 --- a/kosmorro/__main__.py +++ b/kosmorro/__main__.py @@ -120,7 +120,7 @@ def run(): output = get_search_information( args.search, args.from_, - args.to, + args.until, timezone, output_format, use_colors, @@ -245,20 +245,20 @@ def get_information( def get_search_information( requested_events: [EventType], search_from: date, - search_to: date, + search_until: date, timezone: int, output_format: str, colors: bool, show_graph: bool, ) -> dumper.Dumper: try: - if search_from is None or search_to is None: + if search_until is None: raise SearchDatesNotGivenError event_types = [EventType[event.upper()] for event in requested_events] from_ = parse_date(search_from) - to = parse_date(search_to) - events_list = search_events(event_types, to, from_, timezone) + until = parse_date(search_until) + events_list = search_events(event_types, until, from_, timezone) return get_dumpers()[output_format]( ephemerides=[], @@ -398,11 +398,11 @@ def get_args(output_formats: [str]): "--from", dest="from_", type=str, - default=None, - help=_("The date to begin searching for events."), + default=today.strftime("%Y-%m-%d"), + help=_("The date to begin searching for events. Default is today."), ) parser.add_argument( - "--to", type=str, default=None, help=_("The date to end searching for events.") + "--until", type=str, default=None, help=_("The date to end searching for events.") ) parser.add_argument( "--no-colors", diff --git a/kosmorro/exceptions.py b/kosmorro/exceptions.py index 68e42149..5a6bb51a 100644 --- a/kosmorro/exceptions.py +++ b/kosmorro/exceptions.py @@ -70,7 +70,7 @@ class SearchDatesNotGivenError(RuntimeError): def __init__(self): super().__init__() self.msg = _( - "Both 'from' and 'to' dates are required when searching for events." + "Search end date (--until) is required when searching events.'" )