Some cleanup

[frenchie/icalparse.git] / icalparse.py

diff --git a/icalparse.py b/icalparse.py
index 0fd0de7..653d559 100755 (executable)
--- a/icalparse.py
+++ b/icalparse.py
@@ -26,10 +26,8 @@ import os
 
 
 class InvalidICS(Exception): pass
-class notJoined(Exception): pass
 class IncompleteICS(InvalidICS): pass
 
-
 def lineJoiner(oldcal):
        '''Takes a string containing a calendar and returns an array of its lines'''
 
@@ -60,18 +58,20 @@ def lineFolder(oldcal, length=75):
                if len(line.rstrip()) <= length:
                        cal.append(line)
                else:
-                       brokenline = [line[0:length] + '\r\n']
+                       brokenline = [line[0:length]]
                        ll = length
-                       while ll < len(line.rstrip('\r\n')) + 1:
-                               brokenline.append(' ' + line[ll:sl+ll].rstrip('\r\n') + '\r\n')
+                       while ll < len(line) + 1:
+                               brokenline.append(line[ll:sl+ll])
                                ll += sl
-                       cal += brokenline
+                       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 key, value pairs'''
+       '''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]
 
@@ -84,7 +84,8 @@ def splitFields(cal):
 
 
 def joinFields(ical):
-       '''Takes a list of tuples that make up a calendar file and returns a list of lines'''
+       '''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]
 
@@ -124,9 +125,7 @@ def getContent(url='',stdin=False):
 
 def getHTTPContent(url='',cache='.httplib2-cache'):
        '''This function attempts to play nice when retrieving content from HTTP
-       services. It's what you should use in a CGI script. It will (by default)
-       slurp the first 20 bytes of the file and check that we are indeed looking
-       at an ICS file before going for broke.'''
+       services. It's what you should use in a CGI script.'''
 
        try:
                import httplib2
@@ -201,6 +200,29 @@ def applyRules(ical, rules=[], verbose=False):
        return ical
 
 
+def writeOutput(cal, outfile=''):
+       '''Takes a list of lines and outputs to the specified file'''
+
+       if not cal:
+               sys.stderr.write('Refusing to write out an empty file')
+               sys.exit(0)
+
+       if not outfile:
+               out = sys.stdout
+       else:
+               try:
+                       out = open(outfile, 'w')
+               except (IOError, OSError), e:
+                       sys.stderr.write('%s\n'%e)
+                       sys.exit(1)
+
+       if cal[-1]: cal.append('')
+
+       out.write('\r\n'.join(cal))
+
+       if not out == sys.stdout:
+               out.close()
+
 
 if __name__ == '__main__':
        from optparse import OptionParser
@@ -210,6 +232,8 @@ if __name__ == '__main__':
        parser = OptionParser('usage: %prog [options] url')
        parser.add_option('-s', '--stdin', action='store_true', dest='stdin',
                default=False, help='Take a calendar from standard input')
+       parser.add_option('-v', '--verbose', action='store_true', dest='verbose',
+               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)')
 
@@ -225,6 +249,6 @@ if __name__ == '__main__':
 
        content = getContent(url, options.stdin)
        cal = lineJoiner(content)
-       ical = applyRules(splitFields(cal), generateRules())
+       ical = applyRules(splitFields(cal), generateRules(), options.verbose)
        output = lineFolder(joinFields(ical))
-       print output
+       writeOutput(output, options.outfile)