Comment cleaup, added function

[frenchie/icalparse.git] / icalparse.py

diff --git a/icalparse.py b/icalparse.py
index 7953420..5010d1d 100755 (executable)
--- a/icalparse.py
+++ b/icalparse.py
@@ -24,51 +24,33 @@ import sys
 import re
 import urlparse
 import os
-from optparse import OptionParser
 
 class InvalidICS(Exception): pass
 class notJoined(Exception): pass
 
-# RFC5545 and RFC5546 iCalendar registries contain upper case letters
-# and dashes only and are separated from the value by a colon (:)
 icalEntry = re.compile('^[A-Z\-]+:.*')
 
 def lineJoiner(oldcal):
-       '''Unfolds a calendar so that items can be parsed'''
+       '''Takes a string containing a calendar and returns an array of its lines'''
 
-       cal = []
-
-       # Strip newlines (
-       for line in oldcal:
-               line = line.rstrip('\r\n')
-
-               # Reassemble broken Lines
-               if not line:
-                       if not cal: continue
-                       else: cal[-1] += '\\n'
-               elif line[0] == ' ':
-                       if not cal: raise InvalidICS, 'First line of ICS must be element'
-                       line = line[1:len(line)]
-                       cal[-1] += line
-               elif not icalEntry.match(line):
-                       if not cal: raise InvalidICS, 'First line of ICS must be element'
-                       cal[-1] += '\\n' + line
-               else:
-                       if cal: cal[-1] += '\r\n'
-                       cal.append(line)
+       if list(oldcal) == oldcal:
+               oldcal = '\r\n'.join(oldcal)
 
-       cal[-1] += '\r\n'
+       oldcal.replace('\r\n ', '')
+       return oldcal.split('\r\n')
 
-       return cal
 
-def lineSplitter(oldcal, length=75):
+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 ending line ending fit inside length, do nothing
+               # Line fits inside length, do nothing
                if len(line.rstrip()) <= length:
                        cal.append(line)
                else:
@@ -81,7 +63,12 @@ def lineSplitter(oldcal, length=75):
 
        return cal
 
+def getContent(url='',stdin=False):
+       pass
+
+
 if __name__ == '__main__':
+       from optparse import OptionParser
        # If the user passed us a 'stdin' argument, we'll go with that,
        # otherwise we'll try for a url opener
 
@@ -96,8 +83,10 @@ if __name__ == '__main__':
        if not args and not options.stdin:
                parser.print_usage()
                sys.exit(0)
-
-       url = args[0]
+       elif not options.stdin:
+               url = args[0]
+       else:
+               url = ''
 
        # Work out what url parsers we're going to need based on what the user
        # gave us on the command line - we do like files after all
@@ -114,12 +103,14 @@ if __name__ == '__main__':
                        import urllib2
 
        # Try and play nice with HTTP servers unless something goes wrong. We don't
-       # really care about this cache so it can be somewhere volatile
+       # really care about this cache (A lot of ics files seem to be generated with
+       # php which hates caching with a passion).
        h = False
        if 'httplib2' in sys.modules:
                try: h = httplib2.Http('.httplib2-cache')
                except OSError: h = httplib2.Http()
 
+       # Load urllib2 if this is not a stdin
        if not options.stdin and (not http or not 'httplib2' in sys.modules):
                import urllib2
 
@@ -129,12 +120,11 @@ if __name__ == '__main__':
                sys.stderr.write('%s\n'%e)
                sys.exit(1)
 
-       if not u:
+       if not u and not options.stdin:
                try: content = open(os.path.abspath(url),'r').read()
                except (IOError, OSError), e:
                        sys.stderr.write('%s\n'%e)
                        sys.exit(1)
 
-       # RFC5545 and RFC5546 Calendars should be generated UTF-8 and we need to
-       # be able to read ANSI as well. This should take care of us.
-       content = unicode(content, encoding='utf-8')
+       if options.stdin:
+               content = sys.stdin.read()