sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix semicolon bug

Browse source 
Fix #70

Also remove multiple parameters from vcard template. Android JB for
example converts this:

    Email: lol@lol (work)
    Email: lol@lol (home)

to this:

    EMAIL;TYPE=WORK:lol@lol

which is exactly what icalendar (our parser) does too. ownCloud on the
other hand converts this:

    EMAIL;TYPE=HOME,WORK:lol@lol

to this:

    EMAIL;TYPE=HOME;TYPE=WORK:lol@lol

So at this point it does not really matter anymore whether our behavior
is RFC-conform or not.
This commit is contained in:
Markus Unterwaditzer 2014-05-30 17:06:06 +02:00
parent f59c8d1fdf
commit 96d55c523c
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/__init__.py
View file

@ -31,11 +31,11 @@ VERSION:3.0
FN:Cyrus Daboo FN:Cyrus Daboo
N:Daboo;Cyrus N:Daboo;Cyrus
ADR;TYPE=POSTAL:;2822 Email HQ;Suite 2821;RFCVille;PA;15213;USA ADR;TYPE=POSTAL:;2822 Email HQ;Suite 2821;RFCVille;PA;15213;USA
EMAIL;TYPE=INTERNET;TYPE=PREF:cyrus@example.com EMAIL;TYPE=PREF:cyrus@example.com
NICKNAME:me NICKNAME:me
NOTE:Example VCard. NOTE:Example VCard.
ORG:Self Employed ORG:Self Employed
TEL;TYPE=WORK;TYPE=VOICE:412 605 0499 TEL;TYPE=VOICE:412 605 0499
TEL;TYPE=FAX:412 605 0705 TEL;TYPE=FAX:412 605 0705
URL:http://www.example.com URL:http://www.example.com
X-SOMETHING:{r} X-SOMETHING:{r}

17
vdirsyncer/utils/vobject.py
View file

@ -13,7 +13,17 @@ import icalendar.parser
from . import text_type, itervalues from . import text_type, itervalues
IGNORE_PROPS = frozenset((
def _process_properties(*s):
rv = set()
for key in s:
rv.add(key + ':')
rv.add(key + ';')
return frozenset(rv)
IGNORE_PROPS = _process_properties(
# PRODID is changed by radicale for some reason after upload # PRODID is changed by radicale for some reason after upload
'PRODID', 'PRODID',
# VERSION can get lost in singlefile storage # VERSION can get lost in singlefile storage
@ -24,7 +34,7 @@ IGNORE_PROPS = frozenset((
# REV is from the VCARD specification and is supposed to change when the # REV is from the VCARD specification and is supposed to change when the
# item does -- however, we can determine that ourselves # item does -- however, we can determine that ourselves
'REV' 'REV'
)) )
def normalize_item(text, ignore_props=IGNORE_PROPS, use_icalendar=True): def normalize_item(text, ignore_props=IGNORE_PROPS, use_icalendar=True):
@ -38,7 +48,7 @@ def normalize_item(text, ignore_props=IGNORE_PROPS, use_icalendar=True):
return u'\r\n'.join(line.strip() return u'\r\n'.join(line.strip()
for line in lines for line in lines
if line.strip() and if line.strip() and
not any(line.startswith(p + ':') not any(line.startswith(p)
for p in IGNORE_PROPS)) for p in IGNORE_PROPS))
@ -83,6 +93,7 @@ def to_unicode_lines(item):
for content_line in item.content_lines(): for content_line in item.content_lines():
if content_line: if content_line:
content_line = content_line.replace(u'\\;', u';')
yield icalendar.parser.foldline(content_line) yield icalendar.parser.foldline(content_line)