comparison multimerge.py @ 17:4168dde804ae

Rename some variables.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 04 Jul 2016 13:20:01 +0300
parents 8262efacf3fb
children b6f27067d25d
comparison
equal deleted inserted replaced
16:9a4dd2eb7701 17:4168dde804ae
327 gcm_debug("Fetching available calendars ..") 327 gcm_debug("Fetching available calendars ..")
328 calendars = [] 328 calendars = []
329 calPageToken = None 329 calPageToken = None
330 while True: 330 while True:
331 # We want everything except deleted and hidden calendars 331 # We want everything except deleted and hidden calendars
332 calResult = service.calendarList().list( 332 result = service.calendarList().list(
333 showHidden=False, 333 showHidden=False,
334 showDeleted=False, 334 showDeleted=False,
335 pageToken=calPageToken 335 pageToken=calPageToken
336 ).execute() 336 ).execute()
337 337
338 calendars.extend(calResult.get("items", [])) 338 calendars.extend(result.get("items", []))
339 calPageToken = calResult.get("nextPageToken") 339 calPageToken = result.get("nextPageToken")
340 if not calPageToken: 340 if not calPageToken:
341 break 341 break
342 342
343 if len(calendars) == 0: 343 if len(calendars) == 0:
344 gcm_fatal("No calendars found?") 344 gcm_fatal("No calendars found?")
367 ## Now, we fetch and collect events 367 ## Now, we fetch and collect events
368 gcm_debug(u"Fetching calendar events .. ") 368 gcm_debug(u"Fetching calendar events .. ")
369 calEvents = [] 369 calEvents = []
370 for calendar in src_calendars: 370 for calendar in src_calendars:
371 gcm_debug("- "+calendar["id"]) 371 gcm_debug("- "+calendar["id"])
372 eventsResult = service.events().list( 372 result = service.events().list(
373 timeZone="EEST", 373 timeZone="EEST",
374 calendarId=calendar["id"], 374 calendarId=calendar["id"],
375 singleEvents=True, 375 singleEvents=True,
376 showDeleted=False, 376 showDeleted=False,
377 orderBy="startTime").execute() 377 # orderBy="startTime",
378 ).execute()
378 379
379 # Add events, if any, to main list 380 # Add events, if any, to main list
380 events = eventsResult.get("items", []) 381 events = result.get("items", [])
381 if events: 382 if events:
382 calEvents.append(events) 383 calEvents.append(events)
383 if cfg.debug: 384 if cfg.debug:
384 gcm_dump_events(events) 385 gcm_dump_events(events)
385 386
386 387
387 ## Get current events 388 ## Get current events
388 gcm_debug(u"Fetching current target calendar events {0}".format(cfg.dest_id)) 389 gcm_debug(u"Fetching current target calendar events {0}".format(cfg.dest_id))
389 eventsResult = service.events().list( 390 result = service.events().list(
390 calendarId=cfg.dest_id, 391 calendarId=cfg.dest_id,
391 singleEvents=True, 392 singleEvents=True,
392 showDeleted=True).execute() 393 showDeleted=True).execute()
393 394
394 currEvents = eventsResult.get("items", []) 395 currEvents = result.get("items", [])
395 if currEvents: 396 if currEvents:
396 gcm_debug(u"Found {0} event(s).".format(len(currEvents))) 397 gcm_debug(u"Found {0} event(s).".format(len(currEvents)))
397 else: 398 else:
398 gcm_debug(u"No current events.") 399 gcm_debug(u"No current events.")
399 400