correcting cleanup of nextcloud calendar
This commit is contained in:
@@ -26,19 +26,20 @@ def do_import(username, password, calendar, server, ics_url, ics_username, ics_p
|
|||||||
logging.error(e)
|
logging.error(e)
|
||||||
return
|
return
|
||||||
|
|
||||||
existing_uids = [e['UID'].to_ical() for e in target_cal.walk('VEVENT')]
|
existing_uids = [bytes.decode(e['UID'].to_ical()).replace('\'', '').replace('/', 'slash') for e in target_cal.walk('VEVENT')]
|
||||||
|
|
||||||
sourceRequest = requests.get(ics_url, auth=(ics_username, ics_password))
|
sourceRequest = requests.get(ics_url, auth=(ics_username, ics_password))
|
||||||
sourceRequest.encoding = 'utf-8'
|
sourceRequest.encoding = 'utf-8'
|
||||||
sourceContent = sourceRequest.text
|
sourceContent = sourceRequest.text
|
||||||
c = Calendar.from_ical(sourceContent)
|
c = Calendar.from_ical(sourceContent)
|
||||||
|
|
||||||
|
distant_uids = [bytes.decode(e['UID'].to_ical()).replace('\'', '').replace('/', 'slash') for e in c.walk('VEVENT')]
|
||||||
|
|
||||||
imported_uids = []
|
imported_uids = []
|
||||||
for e in c.walk('VEVENT'):
|
for e in c.walk('VEVENT'):
|
||||||
uid = bytes.decode(e['UID'].to_ical())
|
uid = bytes.decode(e['UID'].to_ical()).replace('\'', '').replace('/', 'slash')
|
||||||
uid.replace('\'', '')
|
|
||||||
uid.replace('/', 'slash')
|
|
||||||
name = bytes.decode(e['SUMMARY'].to_ical())
|
name = bytes.decode(e['SUMMARY'].to_ical())
|
||||||
|
if uid not in existing_uids:
|
||||||
cal = Calendar()
|
cal = Calendar()
|
||||||
cal.add_component(e)
|
cal.add_component(e)
|
||||||
r = requests.put('%s/%s.ics' % (base_url, uid),
|
r = requests.put('%s/%s.ics' % (base_url, uid),
|
||||||
@@ -54,11 +55,11 @@ def do_import(username, password, calendar, server, ics_url, ics_username, ics_p
|
|||||||
else:
|
else:
|
||||||
r.raise_for_status()
|
r.raise_for_status()
|
||||||
|
|
||||||
for uid in existing_uids:
|
for euid in existing_uids:
|
||||||
if not uid in imported_uids:
|
if not euid in distant_uids:
|
||||||
r = requests.delete('%s/%s.ics' % (base_url, uid), auth=(username, password))
|
r = requests.delete('%s/%s.ics' % (base_url, euid), auth=(username, password))
|
||||||
if r.status_code == 204:
|
if r.status_code == 204:
|
||||||
logging.info('Deleted %s (%s)' % (uid, name))
|
logging.info('Deleted %s' % euid)
|
||||||
elif r.status_code == 404:
|
elif r.status_code == 404:
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user