# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1511543517 -3600
# Node ID c675f7bdd52d178533bb4d6bcb5e6b9afa616fd9
# Parent  7023d88d726051bae98f61b9d72199f383553a7f
Extended the value decoding and encoding mechanisms to avoid splitting RRULE
values using commas and quoting commas in encoded RRULE values.

diff -r 7023d88d7260 -r c675f7bdd52d vCalendar.py
--- a/vCalendar.py	Tue Jun 06 00:02:05 2017 +0200
+++ b/vCalendar.py	Fri Nov 24 18:11:57 2017 +0100
@@ -3,7 +3,8 @@
 """
 Parsing of vCalendar and iCalendar files.
 
-Copyright (C) 2008, 2009, 2011, 2013, 2014 Paul Boddie <paul@boddie.org.uk>
+Copyright (C) 2008, 2009, 2011, 2013, 2014, 2015,
+              2016, 2017 Paul Boddie <paul@boddie.org.uk>
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -53,9 +54,13 @@
 MULTIVALUED_PARAMETERS = set([
     "DELEGATED-FROM", "DELEGATED-TO", "MEMBER"
     ])
+NON_MULTIVALUED_PROPERTIES = set([
+    "RRULE"
+    ])
 QUOTED_TYPES = set(["URI"])
 
 unquoted_separator_regexp = re.compile(r"(?<!\\)([,;])")
+unquoted_semicolon_regexp = re.compile(r"(?<!\\)([;])")
 
 # Parser classes.
 
@@ -73,22 +78,27 @@
         name, parameters, value = vContent.StreamParser.next(self)
         return name, self.decode_parameters(parameters), value
 
-    def decode_content(self, value):
+    def decode_content(self, name, value):
 
         """
-        Decode the given 'value' (which may represent a collection of distinct
-        values), replacing quoted separator characters.
+        Decode for property 'name' the given 'value' (which may represent a
+        collection of distinct values), replacing quoted separator characters.
         """
 
         sep = None
         values = []
 
-        for i, s in enumerate(unquoted_separator_regexp.split(value)):
+        if name in NON_MULTIVALUED_PROPERTIES:
+            split = unquoted_semicolon_regexp.split
+        else:
+            split = unquoted_separator_regexp.split
+
+        for i, s in enumerate(split(value)):
             if i % 2 != 0:
                 if not sep:
                     sep = s
                 continue
-            values.append(self.decode_content_value(s))
+            values.append(self.decode_content_value(name, s))
 
         if sep == ",":
             return values
@@ -97,13 +107,16 @@
         else:
             return values[0]
 
-    def decode_content_value(self, value):
+    def decode_content_value(self, name, value):
 
-        "Decode the given 'value', replacing quoted separator characters."
+        """
+        Decode for property 'name' the given 'value', replacing quoted separator
+        characters.
+        """
 
         # Replace quoted characters (see 4.3.11 in RFC 2445).
 
-        value = vContent.StreamParser.decode_content(self, value)
+        value = vContent.StreamParser.decode_content(self, name, value)
         return value.replace(r"\,", ",").replace(r"\;", ";")
 
     # Internal methods.
@@ -189,21 +202,23 @@
 
         for param_name, param_value in parameters.items():
             if param_name in QUOTED_PARAMETERS:
-                param_value = self.encode_quoted_parameter_value(param_value)
                 separator = '","'
             else:
                 separator = ","
             if param_name in MULTIVALUED_PARAMETERS:
                 param_value = separator.join(param_value)
+            if param_name in QUOTED_PARAMETERS:
+                param_value = self.encode_quoted_parameter_value(param_value)
             encoded_parameters[param_name] = param_value
 
         return encoded_parameters
 
-    def encode_content(self, value):
+    def encode_content(self, name, value):
 
         """
-        Encode the given 'value' (which may be a list or tuple of separate
-        values), quoting characters and separating collections of values.
+        Encode for property 'name' the given 'value' (which may be a list or
+        tuple of separate values), quoting characters and separating collections
+        of values.
         """
 
         if isinstance(value, list):
@@ -214,17 +229,32 @@
             value = [value]
             sep = ""
 
-        return sep.join([self.encode_content_value(v) for v in value])
+        l = []
+        for v in value:
+            l.append(self.encode_content_value(name, v))
+        return sep.join(l)
 
-    def encode_content_value(self, value):
+    def encode_content_value(self, name, value):
 
-        "Encode the given 'value', quoting characters."
+        "Encode for property 'name' the given 'value', quoting characters."
 
         # Replace quoted characters (see 4.3.11 in RFC 2445).
 
-        value = vContent.StreamWriter.encode_content(self, value)
+        value = vContent.StreamWriter.encode_content(self, name, value)
+
+        if name in NON_MULTIVALUED_PROPERTIES:
+            quote = self.quote_semicolons
+        else:
+            quote = self.quote_separators
+
+        return quote(value)
+
+    def quote_separators(self, value):
         return value.replace(";", r"\;").replace(",", r"\,")
 
+    def quote_semicolons(self, value):
+        return value.replace(";", r"\;")
+
 # Public functions.
 
 def parse(stream_or_string, encoding=None, non_standard_newline=0):
@@ -289,7 +319,12 @@
 
     return vContent.iterwrite(stream_or_string, write, encoding, line_length, vCalendarStreamWriter)
 
-to_dict = vContent.to_dict
+def to_dict(node):
+
+    "Return the 'node' converted to a dictionary representation."
+
+    return vContent.to_dict(node, SECTION_TYPES)
+
 to_node = vContent.to_node
 
 # vim: tabstop=4 expandtab shiftwidth=4
diff -r 7023d88d7260 -r c675f7bdd52d vContent.py
--- a/vContent.py	Tue Jun 06 00:02:05 2017 +0200
+++ b/vContent.py	Fri Nov 24 18:11:57 2017 +0100
@@ -4,7 +4,7 @@
 Parsing of vCard, vCalendar and iCalendar files.
 
 Copyright (C) 2005, 2006, 2007, 2008, 2009, 2011, 2013,
-              2014, 2015 Paul Boddie <paul@boddie.org.uk>
+              2014, 2015, 2017 Paul Boddie <paul@boddie.org.uk>
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -280,9 +280,12 @@
 
         return self.parse_content_line()
 
-    def decode_content(self, value):
+    def decode_content(self, name, value):
 
-        "Decode the given 'value', replacing quoted characters."
+        """
+        Decode for property 'name' the given 'value', replacing quoted
+        characters.
+        """
 
         return value.replace("\r", "").replace("\\N", "\n").replace("\\n", "\n")
 
@@ -346,7 +349,7 @@
         encoding = parameters.get("ENCODING")
         charset = parameters.get("CHARSET")
 
-        value = self.decode_content(value)
+        value = self.decode_content(name, value)
 
         if encoding == "QUOTED-PRINTABLE":
             return unicode(quopri.decodestring(value), charset or "iso-8859-1")
@@ -582,7 +585,7 @@
             elif encoding == "BASE64":
                 value = base64.encodestring(value)
 
-            return self.encode_content(value)
+            return self.encode_content(name, value)
         except TypeError:
             raise WriteError, "Property %r value with parameters %r cannot be encoded: %r" % (name, parameters, value)
 
@@ -609,9 +612,9 @@
 
         return encoded_parameters
 
-    def encode_content(self, value):
+    def encode_content(self, name, value):
 
-        "Encode the given 'value', quoting characters."
+        "Encode for property 'name' the given 'value', quoting characters."
 
         return (value or "").replace("\n", "\\n")