X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=parserrules.py;h=a2175fed34e8168e62384de0275274f164be1b93;hb=ae40266069204ee411350d5fd3d31f40d89187af;hp=424de515cb496f91c58fd8dc71ee20af54851324;hpb=1a7f8e3e07ffd99b36cbb0504b0359c089e9f3a4;p=frenchie%2Ficalparse.git

diff --git a/parserrules.py b/parserrules.py
index 424de51..a2175fe 100644
--- a/parserrules.py
+++ b/parserrules.py
@@ -28,6 +28,9 @@
 
 import vobject
 
+ruleConfig = {}
+ruleConfig["defaultTZ"] = "UTC"
+
 def facebookOrganiser(cal):
 	'''Adds organiser details to the body of facebook calendars.'''
 
@@ -51,46 +54,72 @@ def whatPrivacy(cal):
 
 	for event in cal.vevent_list:
 		if event.contents.has_key(u'class'):
-			del event.contents[u'class']
 			# Bit of a hack as class is a reserved word in python
+			del event.contents[u'class']
 			event.add('class').value = "PUBLIC"
 
 	return cal
 
-def dropMSKeys(cal):
-	'''Drops microsoft keys, good for outlook, just bandwidth when not.'''
-
-	eventBlacklist = [x.lower() for x in [
-		"X-ALT-DESC",
-		"X-MICROSOFT-CDO-BUSYSTATUS",
-		"X-MICROSOFT-CDO-IMPORTANCE",
-		"X-MICROSOFT-DISALLOW-COUNTER",
-		"X-MS-OLK-ALLOWEXTERNCHECK",
-		"X-MS-OLK-AUTOSTARTCHECK",
-		"X-MS-OLK-CONFTYPE",
-		"X-MS-OLK-AUTOFILLLOCATION"
-	]]
-
-	for event in cal.vevent_list:
-		for blacklist in eventBlacklist:
-			if event.contents.has_key(blacklist): del event.contents[blacklist]
+def exDate(cal):
+	'''Replacing multi-value EXDATES with multiple single-value EXDATES'''
 
-	return cal
+	from datetime import datetime
+	from pytz import timezone
 
-def exDate(cal):
-	'''Changes multi-EXDATE into singles (apple can't obey even simple specs)'''
+	default = timezone(ruleConfig["defaultTZ"])
 
 	for event in cal.vevent_list:
 		if not event.contents.has_key(u'exdate'): continue
 		dates = event.exdate.value
-		try: tzid = event.exdate.tzid_param
-		except AttributeError: tzid = ''
 
 		del event.contents[u'exdate']
 
 		for date in dates:
+			if isinstance(date, datetime):
+				if date.tzinfo is None: date = date.replace(tzinfo = default)
+				date = date.astimezone(vobject.icalendar.utc)
 			entry = event.add(u'exdate')
 			entry.value = [date]
-			if tzid: entry.tzid_param = tzid
+
+	return cal
+
+def utcise(cal):
+	'''Removing local timezones in favour of UTC. If the remote calendar specifies a timezone
+	then use it, otherwise assume it's in the user-specified or default values'''
+
+	from datetime import datetime
+	from pytz import timezone
+
+	default = timezone(ruleConfig["defaultTZ"])
+
+	for event in cal.vevent_list:
+		dtstart = getattr(event, 'dtstart', None)
+		dtend = getattr(event, 'dtend', None)
+
+		for i in (dtstart, dtend):
+			if not i: continue
+			dt = i.value
+			if isinstance(dt, datetime):
+				if dt.tzinfo is None: dt = dt.replace(tzinfo = default)
+				i.value = dt.astimezone(vobject.icalendar.utc)
+
+	return cal
+
+def unwantedParams(cal):
+	'''Removing unwanted parameters'''
+
+	blklist = [
+		"LANGUAGE",
+		"X-VOBJ-ORIGINAL-TZID",
+		"TZID"
+	]
+
+	for event in cal.vevent_list:
+		for attr in event.contents:
+			attr = getattr(event, attr)
+			try:
+				for i in blklist:
+					while i in attr.params: del attr.params[i]
+			except AttributeError: continue
 
 	return cal