comparison multimerge.py @ 103:fc361e368630

Improve gcm_dump_events() further by changing show parameter to a lambda function to filter events to be shown. If set to None, everything will be shown.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 17 Oct 2016 13:16:32 +0300
parents 7ab6beb4c709
children f6274227114b
comparison
equal deleted inserted replaced
102:7ab6beb4c709 103:fc361e368630
120 if not credentials or credentials.invalid: 120 if not credentials or credentials.invalid:
121 gcm_fatal(u"Failed to authenticate / invalid credentials.") 121 gcm_fatal(u"Failed to authenticate / invalid credentials.")
122 return credentials 122 return credentials
123 123
124 124
125 def gcm_dump_events(events, show_all): 125 def gcm_dump_events(events, show):
126 for event in events: 126 for event in events:
127 if event["status"] != u"cancelled" or show_all: 127 if show == None or show(event):
128 ev_start = event["start"].get("dateTime", event["start"].get("date")) if "start" in event else "?" 128 ev_start = event["start"].get("dateTime", event["start"].get("date")) if "start" in event else "?"
129 ev_end = event["end"].get("dateTime", event["end"].get("date")) if "end" in event else "?" 129 ev_end = event["end"].get("dateTime", event["end"].get("date")) if "end" in event else "?"
130 summary = event["summary"] if "summary" in event else "?" 130 summary = event["summary"] if "summary" in event else "?"
131 status = "*" if event["status"] != u"cancelled" else "!" 131 status = "*" if event["status"] != u"cancelled" else "!"
132 gcm_print(u"[{4}] {0:25} - {1:25} : {2} [{3}]".format(ev_start, ev_end, summary, event["id"], status)) 132 gcm_print(u"[{4}] {0:25} - {1:25} : {2} [{3}]".format(ev_start, ev_end, summary, event["id"], status))
546 if c_found != None: 546 if c_found != None:
547 event["colorId"] = c_found 547 event["colorId"] = c_found
548 event["summary"] = u"[{1}] {0}".format(event["summary"], calendar["gcm_id"]) 548 event["summary"] = u"[{1}] {0}".format(event["summary"], calendar["gcm_id"])
549 src_events.extend(events) 549 src_events.extend(events)
550 if gcm_check_debug(4): 550 if gcm_check_debug(4):
551 gcm_dump_events(events, True) 551 gcm_dump_events(events, (lambda ev: ev["status"] != u"cancelled"))
552 552
553 553
554 ## Get current events 554 ## Get current events
555 gcm_debug(3, u"Fetching current target calendar events.") 555 gcm_debug(3, u"Fetching current target calendar events.")
556 result = service.events().list( 556 result = service.events().list(