summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcos <cos>2021-05-26 13:52:40 +0200
committercos <cos>2021-05-28 21:25:37 +0200
commit31c6a3d6ed30d493053ab6e0a04d79789c52ddeb (patch)
treec49c89c3c68e96242717c8efbf5b59d46ea50dbb
parent4c14414278499a6f430c08e2842cddf7db7fd8db (diff)
downloadcalendar-cli-31c6a3d6ed30d493053ab6e0a04d79789c52ddeb.zip
Same tz for dtstart, dtcreated and dtend in agenda
Be consistent in using the selected timezone when outputing an agenda with a custom event template. Also rename first use of dtstart as search_dtstart and friends in calendar_agenda(), to reduce confusing reuse of same variable name for different purposes in same function.
-rwxr-xr-xcalendar-cli.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/calendar-cli.py b/calendar-cli.py
index b22929e..de82828 100755
--- a/calendar-cli.py
+++ b/calendar-cli.py
@@ -479,21 +479,21 @@ def calendar_agenda(caldav_conn, args):
raise ValueError("Agenda with --nocaldav only makes sense together with --icalendar")
if args.from_time:
- dtstart = dateutil.parser.parse(args.from_time)
- dtstart = _tz(args.timezone).localize(dtstart)
+ search_dtstart = dateutil.parser.parse(args.from_time)
+ search_dtstart = _tz(args.timezone).localize(search_dtstart)
else:
- dtstart = _now()
+ search_dtstart = _now()
if args.to_time:
- dtend = dateutil.parser.parse(args.to_time)
- dtend = _tz(args.timezone).localize(dtend)
+ search_dtend = dateutil.parser.parse(args.to_time)
+ search_dtend = _tz(args.timezone).localize(search_dtend)
elif args.agenda_mins:
- dtend = dtstart + timedelta(minutes=args.agenda_mins)
+ search_dtend = search_dtstart + timedelta(minutes=args.agenda_mins)
elif args.agenda_days:
- dtend = dtstart + timedelta(args.agenda_days)
- ## TODO - error handling if dtend is not set above - but agenda_days have a default value, so that probably won't happen
+ search_dtend = search_dtstart + timedelta(args.agenda_days)
+ ## TODO - error handling if search_dtend is not set above - but agenda_days have a default value, so that probably won't happen
## TODO: time zone
- events_ = find_calendar(caldav_conn, args).date_search(dtstart, dtend, expand=True)
+ events_ = find_calendar(caldav_conn, args).date_search(search_dtstart, search_dtend, expand=True)
events = []
if args.icalendar:
for ical in events_:
@@ -531,7 +531,7 @@ def calendar_agenda(caldav_conn, args):
if hasattr(event['instance'], timeattr):
event[timeattr] = getattr(event['instance'], timeattr).value
if hasattr(event[timeattr], 'strftime'):
- event[timeattr] = event[timeattr].strftime(args.timestamp_format)
+ event[timeattr] = event[timeattr].astimezone(_tz(args.timezone)).strftime(args.timestamp_format)
else:
event[timeattr] = '-'
for textattr in vcal_txt_one: