X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=icalparse.py;h=6c3aac67ff4739d01b544462ed279aa3dc805689;hb=18fa3d2d1ba2875bf7c15bd36862fa7368e337c0;hp=f4b88770af657436b0935681a9482856030aa3c5;hpb=8dcab4af051e7296810493425a8637496d2150ac;p=frenchie%2Ficalparse.git

diff --git a/icalparse.py b/icalparse.py
index f4b8877..6c3aac6 100755
--- a/icalparse.py
+++ b/icalparse.py
@@ -30,6 +30,16 @@ class IncompleteICS(InvalidICS): pass
 
 def lineJoiner(oldcal, encoding='utf-8'):
 	'''Takes a string containing a calendar and returns an array of its lines'''
+	try:
+		oldcal = unicode(oldcal, encoding)
+		oldcal = oldcal.replace('\r\n ', '').replace('\r\n\t','')
+	except UnicodeDecodeError:
+		# This is probably a file with badly folded lines
+		oldcal = oldcal.replace('\r\n ', '').replace('\r\n\t','')
+		try: oldcal = unicode(oldcal, encoding)
+		except UnicodeDecodeError:
+			sys.stderr.write('Malformed File')
+			raise
 
 	if not oldcal[0:15] == 'BEGIN:VCALENDAR':
 		raise InvalidICS, "Does not appear to be a valid ICS file"
@@ -40,8 +50,7 @@ def lineJoiner(oldcal, encoding='utf-8'):
 	if list(oldcal) == oldcal:
 		oldcal = '\r\n'.join(oldcal)
 
-	oldcal = oldcal.replace('\r\n ', '').replace('\r\n\t','')
-	return [unicode(x, encoding) for x in oldcal.strip().split('\r\n')]
+	return oldcal.split('\r\n')
 
 
 def lineFolder(oldcal, length=75):
@@ -64,24 +73,14 @@ def lineFolder(oldcal, length=75):
 			ll = length
 			foldedline = []
 			while uline:
-				# This algorithm prevents slicing multi-byte chars in half
-
-				# Convert up to length octets to unicode, dropping any
-				# half characters
 				ufold = unicode(line[0:ll], 'utf-8', 'ignore')
 				fold = ufold.encode('utf-8')
-
-				# Remove what we've converted from the line
 				uline = uline.replace(ufold,u'',1)
 				line = uline.encode('utf-8')
-
-				# And add the fold to the list
 				foldedline.append(fold)
 
 				# Subsequent lines are shorter as they include a space
 				ll = length - 1
-
-			# Finally, add the fold 'marker' to the line
 			cal.append('\r\n '.join(foldedline))
 
 	return cal
@@ -91,12 +90,14 @@ def splitFields(cal):
 	'''Takes a list of lines in a calendar file and returns a list of tuples
 	as (key, value) pairs'''
 
-	ical = [tuple(x.split(':',1)) for x in cal]
+	ical = []
 
 	# Check that we got 2 items on every line
-	for line in ical:
-		if not len(line) == 2:
-			raise InvalidICS, "Didn't find a content key on: %s"%(line)
+	for line in [tuple(x.split(':',1)) for x in cal]:
+		if not len(line) == 2 and line[0]:
+			raise InvalidICS, 'Unusual content line: %s'%line
+		elif line[0]:
+			ical.append(line)
 
 	return ical
 
@@ -168,9 +169,8 @@ def getHTTPContent(url='',cache='.httplib2-cache'):
 			if 'content-type' in req[0]:
 				for ct in req[0]['content-type'].split(';'):
 					ct = ct.lower()
-					print ct
 					if 'charset' in ct:
-						encoding = ct.split('=')[1]
+						encoding = ct.split('=')[1].strip()
 		return (content, encoding)
 	except ValueError, e:
 		sys.stderr.write('%s\n'%e)