sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-03-29 09:35:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'vcards_split'

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-05-30 17:13:38 +02:00
commit 8493407c49
3 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/__init__.py
View file

@ -18,7 +18,8 @@ vdirsyncer.log.set_level(vdirsyncer.log.logging.DEBUG)
def normalize_item(item):
if not isinstance(item, text_type):
item = item.raw
return tuple(sorted(_normalize_item(item).splitlines()))
return tuple(sorted(_normalize_item(
item, use_icalendar=False).splitlines()))
def assert_item_equals(a, b):
@ -30,11 +31,11 @@ VERSION:3.0
FN:Cyrus Daboo
N:Daboo;Cyrus
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
NOTE:Example VCard.
ORG:Self Employed
TEL;TYPE=WORK;TYPE=VOICE:412 605 0499
TEL;TYPE=VOICE:412 605 0499
TEL;TYPE=FAX:412 605 0705
URL:http://www.example.com
X-SOMETHING:{r}

20
tests/utils/test_vobject.py
View file

@ -10,22 +10,21 @@
from vdirsyncer.utils.vobject import split_collection, join_collection, \
hash_item
from .. import normalize_item, SIMPLE_TEMPLATE, BARE_EVENT_TEMPLATE, \
from .. import normalize_item, VCARD_TEMPLATE, BARE_EVENT_TEMPLATE, \
EVENT_TEMPLATE
_simple_joined = u'\r\n'.join((
u'BEGIN:VADDRESSBOOK',
SIMPLE_TEMPLATE.format(r=123),
SIMPLE_TEMPLATE.format(r=345),
SIMPLE_TEMPLATE.format(r=678),
VCARD_TEMPLATE.format(r=123),
VCARD_TEMPLATE.format(r=345),
VCARD_TEMPLATE.format(r=678),
u'END:VADDRESSBOOK'
))
_simple_split = [
SIMPLE_TEMPLATE.format(r=123),
SIMPLE_TEMPLATE.format(r=345),
SIMPLE_TEMPLATE.format(r=678)
VCARD_TEMPLATE.format(r=123),
VCARD_TEMPLATE.format(r=345),
VCARD_TEMPLATE.format(r=678)
]
@ -36,10 +35,7 @@ def test_split_collection_simple():
def test_join_collection_simple():
item_type = _simple_split[0].splitlines()[0][len(u'BEGIN:'):]
given = join_collection(_simple_split, wrappers={
item_type: (u'VADDRESSBOOK', ())
})
given = join_collection(_simple_split)
print(given)
print(_simple_joined)
assert normalize_item(given) == normalize_item(_simple_joined)

21
vdirsyncer/utils/vobject.py
View file

@ -13,7 +13,17 @@ import icalendar.parser
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',
# VERSION can get lost in singlefile storage
@ -24,11 +34,13 @@ IGNORE_PROPS = frozenset((
# REV is from the VCARD specification and is supposed to change when the
# item does -- however, we can determine that ourselves
'REV'
))
)
def normalize_item(text, ignore_props=IGNORE_PROPS):
def normalize_item(text, ignore_props=IGNORE_PROPS, use_icalendar=True):
try:
if not use_icalendar:
raise Exception()
lines = to_unicode_lines(icalendar.cal.Component.from_ical(text))
except Exception:
lines = sorted(text.splitlines())
@ -36,7 +48,7 @@ def normalize_item(text, ignore_props=IGNORE_PROPS):
return u'\r\n'.join(line.strip()
for line in lines
if line.strip() and
not any(line.startswith(p + ':')
not any(line.startswith(p)
for p in IGNORE_PROPS))
@ -81,6 +93,7 @@ def to_unicode_lines(item):
for content_line in item.content_lines():
if content_line:
content_line = content_line.replace(u'\\;', u';')
yield icalendar.parser.foldline(content_line)