b4tman/sync_ics2gcal
1
0
Fork 0
mirror of https://github.com/b4tman/sync_ics2gcal synced 2025-02-01 12:28:29 +00:00
Code Issues Releases Activity

fix Partial Response fields

Browse Source
This commit is contained in:
Dmitry Belyaev 2018-04-05 14:25:31 +03:00
parent 4f16b8f66b
commit cc75f522d4
Signed by: b4tman
GPG Key ID: 014E87EC54B77673
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gcal_sync/gcal.py
View File

@ -27,13 +27,14 @@ class GoogleCalendar():
def list_events_from(self, start): def list_events_from(self, start):
''' Получение списка событий из GCAL начиная с даты start ''' Получение списка событий из GCAL начиная с даты start
''' '''
fields='nextPageToken,items(id,iCalUID,updated)'
events = [] events = []
page_token = None page_token = None
timeMin = utc.normalize(start.astimezone(utc)).replace( timeMin = utc.normalize(start.astimezone(utc)).replace(
tzinfo=None).isoformat() + 'Z' tzinfo=None).isoformat() + 'Z'
while True: while True:
response = self.service.events().list(calendarId=self.calendarId, pageToken=page_token, response = self.service.events().list(calendarId=self.calendarId, pageToken=page_token,
singleEvents=True, timeMin=timeMin, fields='id,iCalUID,updated').execute() singleEvents=True, timeMin=timeMin, fields=fields).execute()
if 'items' in response: if 'items' in response:
events.extend(response['items']) events.extend(response['items'])
page_token = response.get('nextPageToken') page_token = response.get('nextPageToken')
@ -53,6 +54,7 @@ class GoogleCalendar():
events_exist - list of tuples: (new_event, exists_event) events_exist - list of tuples: (new_event, exists_event)
""" """
fields='items(id,iCalUID,updated)'
events_by_req = [] events_by_req = []
exists = [] exists = []
not_found = [] not_found = []
@ -76,7 +78,7 @@ class GoogleCalendar():
for event in events: for event in events:
events_by_req.append(event) events_by_req.append(event)
batch.add(self.service.events().list(calendarId=self.calendarId, batch.add(self.service.events().list(calendarId=self.calendarId,
iCalUID=event['iCalUID'], showDeleted=True, fields='id,iCalUID,updated'), request_id=str(i)) iCalUID=event['iCalUID'], showDeleted=True, fields=fields), request_id=str(i))
i += 1 i += 1
batch.execute() batch.execute()
self.logger.info('%d events exists, %d not found', self.logger.info('%d events exists, %d not found',
@ -90,6 +92,7 @@ class GoogleCalendar():
events -- список событий events -- список событий
""" """
fields='id'
events_by_req = [] events_by_req = []
def insert_callback(request_id, response, exception): def insert_callback(request_id, response, exception):
@ -106,7 +109,7 @@ class GoogleCalendar():
for event in events: for event in events:
events_by_req.append(event) events_by_req.append(event)
batch.add(self.service.events().insert( batch.add(self.service.events().insert(
calendarId=self.calendarId, body=event, fields='id,iCalUID,updated'), request_id=str(i)) calendarId=self.calendarId, body=event, fields=fields), request_id=str(i))
i += 1 i += 1
batch.execute() batch.execute()
@ -118,6 +121,7 @@ class GoogleCalendar():
event_tuples -- список кортежей событий (новое, старое) event_tuples -- список кортежей событий (новое, старое)
""" """
fields='id'
events_by_req = [] events_by_req = []
def patch_callback(request_id, response, exception): def patch_callback(request_id, response, exception):
@ -136,7 +140,7 @@ class GoogleCalendar():
continue continue
events_by_req.append(event_new) events_by_req.append(event_new)
batch.add(self.service.events().patch( batch.add(self.service.events().patch(
calendarId=self.calendarId, eventId=event_old['id'], body=event_new), fields='id,iCalUID,updated', request_id=str(i)) calendarId=self.calendarId, eventId=event_old['id'], body=event_new), fields=fields, request_id=str(i))
i += 1 i += 1
batch.execute() batch.execute()
@ -147,6 +151,7 @@ class GoogleCalendar():
event_tuples -- список кортежей событий (новое, старое) event_tuples -- список кортежей событий (новое, старое)
""" """
fields='id'
events_by_req = [] events_by_req = []
def update_callback(request_id, response, exception): def update_callback(request_id, response, exception):
@ -165,7 +170,7 @@ class GoogleCalendar():
continue continue
events_by_req.append(event_new) events_by_req.append(event_new)
batch.add(self.service.events().update( batch.add(self.service.events().update(
calendarId=self.calendarId, eventId=event_old['id'], body=event_new, fields='id,iCalUID,updated'), request_id=str(i)) calendarId=self.calendarId, eventId=event_old['id'], body=event_new, fields=fields), request_id=str(i))
i += 1 i += 1
batch.execute() batch.execute()