diff options
author | Tobias Brox <t@tobixen.no> | 2015-04-23 22:43:15 +0200 |
---|---|---|
committer | Tobias Brox <t@tobixen.no> | 2015-04-23 22:43:15 +0200 |
commit | 6f4c57bf8be53c7ab16ba38fc1bb64735aa9f6a7 (patch) | |
tree | ffbbfcb5af14d4d95b56d45d01477617572d5d0e | |
parent | 0a075ea477264422953ce489b91e2a93096e7bf0 (diff) | |
parent | 84021ac16ba15d2864c91c86bb694877ed8afe43 (diff) | |
download | calendar-cli-6f4c57bf8be53c7ab16ba38fc1bb64735aa9f6a7.zip |
Merge branch 'master' of github.com:tobixen/calendar-cli
-rwxr-xr-x | calendar-cli.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/calendar-cli.py b/calendar-cli.py index 0676631..e8db88a 100755 --- a/calendar-cli.py +++ b/calendar-cli.py @@ -290,7 +290,7 @@ def calendar_agenda(caldav_conn, args): events.append({'dtstart': dtstart, 'instance': event}) events.sort(lambda a,b: cmp(a['dtstart'], b['dtstart'])) for event in events: - event['dstart_sql'] = event['dtstart'].strftime("%F %H:%M") + event['dstart'] = event['dtstart'].strftime(args.timestamp_format) for summary_attr in ('summary', 'location'): if hasattr(event['instance'], summary_attr): event['description'] = getattr(event['instance'], summary_attr).value @@ -395,7 +395,8 @@ def main(): calendar_agenda_parser.add_argument('--to-time', help="Fetch calendar until this timestamp") calendar_agenda_parser.add_argument('--agenda-mins', help="Fetch calendar for so many minutes", type=int) calendar_agenda_parser.add_argument('--agenda-days', help="Fetch calendar for so many days", type=int, default=7) - calendar_agenda_parser.add_argument('--event-template', help="Template for printing out the event", default="{dstart_sql} {description}") + calendar_agenda_parser.add_argument('--event-template', help="Template for printing out the event", default="{dstart} {description}") + calendar_agenda_parser.add_argument('--timestamp-format', help="strftime-style format string for the output timestamps", default="%F %H:%M (%a)") calendar_agenda_parser.set_defaults(func=calendar_agenda) calendar_delete_parser = calendar_subparsers.add_parser('delete') |