From: James French <frenchie@frenchie.id.au>
Date: Mon, 4 Mar 2013 11:49:42 +0000 (+0800)
Subject: Add timezone support to the CGI script
X-Git-Tag: cgi-1.0~3
X-Git-Url: https://git.ucc.asn.au/?p=frenchie%2Ficalparse.git;a=commitdiff_plain;h=3a30d02edf1f92efe63481093f06659868d5b724;hp=257bf962578c430062608cb1e10248ec854423db

Add timezone support to the CGI script

- new tz parameter, set it to a valid database entry (eg Australia/Melbourne) to assume the calendar is in that timezone if not specified.
- Facebook seem to have gotten better with this, but why trust them.
---

diff --git a/fbcal.py b/fbcal.py
index 6e6c9f7..d18a515 100755
--- a/fbcal.py
+++ b/fbcal.py
@@ -25,7 +25,7 @@ import cgi
 import vobject
 import icalparse
 import re
-#import cgitb; cgitb.enable()
+import cgitb; cgitb.enable()
 
 def exitQuiet(exitstate=0):
 	print('Content-Type: text/html\n')
@@ -46,13 +46,28 @@ if __name__ == '__main__':
 	key = form['key'].value
 	re.search('[&?]+', key) and exitQuiet()
 	len(key) == 16 or exitQuiet()
-
+	
+	# Historically facebook has been notoriously bad at setting timzeones
+	# in their stuff so this should be a user setting. If it is set in
+	# their calendar it'll  be used otherwise if the user feeds crap or
+	# nothing just assume they want Australia/Perth
+	tz = ""
+	if "tz" in form:
+		from pytz import timezone
+		try:
+			timezone(form['tz'].value)
+			tz = form['tz'].value
+		except: pass
+	
+	ruleConfig = {}
+	ruleConfig["defaultTZ"] = tz or "Australia/Perth"
+				
 	# Okay, we're happy that the input is sane, lets serve up some data
 	url = 'http://www.facebook.com/ical/u.php?uid=%d&key=%s'%(uid,key)
 	(content, encoding) = icalparse.getHTTPContent(url)
 
 	cal = vobject.readOne(unicode(content, encoding))
-	cal = icalparse.applyRules(cal, icalparse.generateRules(), False)
+	cal = icalparse.applyRules(cal, icalparse.generateRules(ruleConfig), False)
 
-	print('Content-Type: text/calendar; charset=%s\n'%encoding)
+	print('Content-Type: text/html; charset=%s\n'%encoding)
 	icalparse.writeOutput(cal)