X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=icalparse.py;h=f00b400d889dd17b50fb2216e8738d59310f6462;hb=d6a7b9600696f577ea2c6f49e99dc6f01b4f76d8;hp=edfca4c6ee7a70a4ae6c16e8124a6b5b4cd2270c;hpb=c973d20ef57023dc0994d7ffeb0a6e1fd6f9eb0f;p=frenchie%2Ficalparse.git diff --git a/icalparse.py b/icalparse.py index edfca4c..f00b400 100755 --- a/icalparse.py +++ b/icalparse.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -# Copyright (c) 2010 James French +# Copyright (c) 2011 James French # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -23,72 +23,8 @@ import sys import urlparse import os - - -class InvalidICS(Exception): pass -class IncompleteICS(InvalidICS): pass - -def lineJoiner(oldcal): - '''Takes a string containing a calendar and returns an array of its lines''' - - if not oldcal[0:15] == 'BEGIN:VCALENDAR': - raise InvalidICS, "Does not appear to be a valid ICS file" - - if not 'END:VCALENDAR' in oldcal[-15:-1]: - raise IncompleteICS, "File appears to be incomplete" - - if list(oldcal) == oldcal: - oldcal = '\r\n'.join(oldcal) - - oldcal = oldcal.replace('\r\n ', '').replace('\r\n\t','') - return [unicode(x, 'utf-8') for x in oldcal.strip().split('\r\n')] - - -def lineFolder(oldcal, length=75): - '''Folds content lines to a specified length, returns a list''' - - if length > 75: - sys.stderr.write('WARN: lines > 75 octets are not RFC compliant\n') - - cal = [] - sl = length - 1 - - for line in oldcal: - line = line.encode('utf-8') - # Line fits inside length, do nothing - if len(line.rstrip()) <= length: - cal.append(line) - else: - brokenline = [line[0:length]] - ll = length - while ll < len(line) + 1: - brokenline.append(line[ll:sl+ll]) - ll += sl - brokenline = '\r\n '.join(brokenline) - cal.append(brokenline) - - return cal - - -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] - - # 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) - - return ical - - -def joinFields(ical): - '''Takes a list of tuples that make up a calendar file and returns it to a - list of lines''' - - return [':'.join(x) for x in ical] +import vobject +from cgi import parse_header def getContent(url='',stdin=False): @@ -96,6 +32,8 @@ def getContent(url='',stdin=False): it can read from the local disk (which you probably don't want it to). ''' + encoding = '' # If we don't populate this, the script will assume UTF-8 + # Special case, if this is a HTTP url, return the data from it using # the HTTP functions which attempt to play a bit nicer. parsedURL = urlparse.urlparse(url) @@ -103,25 +41,27 @@ def getContent(url='',stdin=False): if stdin: content = sys.stdin.read() - return content + return (content, encoding) - if not parsedURL[0]: - try: content = open(os.path.abspath(url),'r').read() - except (IOError, OSError), e: - sys.stderr.write('%s\n'%e) - sys.exit(1) - return content + if not parsedURL[0]: url = 'file://' + os.path.abspath(url) # If we've survived, use python's generic URL opening library to handle it import urllib2 try: res = urllib2.urlopen(url) content = res.read() + ct = res.info().getplist() res.close() except (urllib2.URLError, OSError), e: sys.stderr.write('%s\n'%e) sys.exit(1) - return content + + for param in ct: + if 'charset' in param: + encoding = param.split('=')[1] + break + + return (content, encoding) def getHTTPContent(url='',cache='.httplib2-cache'): @@ -133,28 +73,47 @@ def getHTTPContent(url='',cache='.httplib2-cache'): except ImportError: import urllib2 - if not url: return '' + if not url: return ('','') + + if not 'http' in urlparse.urlparse(url)[0]: return ('','') if 'httplib2' in sys.modules: try: h = httplib2.Http('.httplib2-cache') except OSError: h = httplib2.Http() else: h = False - try: - if h: content = h.request(url)[1] - return content - except ValueError, e: - sys.stderr.write('%s\n'%e) - sys.exit(1) + if h: + try: + req = h.request(url) + except ValueError, e: + sys.stderr.write('%s\n'%e) + sys.exit(1) - try: - content = urllib2.urlopen(url).read() - return content - except (urllib2.URLError, OSError), e: - sys.stderr.write('%s\n'%e) - sys.exit(1) + resp, content = req + if 'content-type' in resp: + ct = 'Content-Type: %s'%req[0]['content-type'] + ct = parse_header(ct) + if 'charset' in ct[1]: encoding = ct[1]['charset'] + else: encoding = '' + else: + ct = '' + encoding = '' + + else: + try: + req = urllib2.urlopen(url) + except urllib2.URLError, e: + sys.stderr.write('%s\n'%e) + sys.exit(1) - return '' + content = req.read() + ct = req.info().getplist() + for param in ct: + if 'charset' in param: + encoding = param.split('=')[1] + break + + return (content, encoding) def generateRules(): @@ -168,38 +127,13 @@ def generateRules(): return rules -def applyRules(ical, rules=[], verbose=False): +def applyRules(cal, rules=[], verbose=False): 'Runs a series of rules on the lines in ical and mangles its output' for rule in rules: - output = [] - if rule.__doc__ and verbose: - print(rule.__doc__) - for line in ical: - try: - out = rule(line[0],line[1]) - except TypeError, e: - output.append(line) - print(e) - continue - - # Drop lines that are boolean False - if not out and not out == None: continue - - # If the rule did something and is a tuple or a list we'll accept it - # otherwise, pay no attention to the man behind the curtain - try: - if tuple(out) == out or list(out) == out and len(out) == 2: - output.append(tuple(out)) - else: - output.append(line) - except TypeError, e: - output.append(line) - - ical = output - - return ical + cal = rule(cal) + return cal def writeOutput(cal, outfile=''): '''Takes a list of lines and outputs to the specified file''' @@ -217,14 +151,11 @@ def writeOutput(cal, outfile=''): sys.stderr.write('%s\n'%e) sys.exit(1) - if cal[-1]: cal.append('') - - out.write('\r\n'.join(cal)) + cal.serialize(out) if not out == sys.stdout: out.close() - if __name__ == '__main__': from optparse import OptionParser # If the user passed us a 'stdin' argument, we'll go with that, @@ -237,6 +168,9 @@ if __name__ == '__main__': default=False, help='Be verbose when rules are being applied') parser.add_option('-o', '--output', dest='outfile', default='', help='Specify output file (defaults to standard output)') + parser.add_option('-m','--encoding', dest='encoding', default='', + help='Specify a different character encoding' + '(ignored if the remote server also specifies one)') (options, args) = parser.parse_args() @@ -248,8 +182,10 @@ if __name__ == '__main__': else: url = '' - content = getContent(url, options.stdin) - cal = lineJoiner(content) - ical = applyRules(splitFields(cal), generateRules(), options.verbose) - output = lineFolder(joinFields(ical)) - writeOutput(output, options.outfile) + (content, encoding) = getContent(url, options.stdin) + encoding = encoding or options.encoding or 'utf-8' + + cal = vobject.readOne(unicode(content, encoding)) + cal = applyRules(cal, generateRules(), options.verbose) + + writeOutput(cal, options.outfile)