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

More refactoring

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-12-21 23:52:50 +01:00
parent c2ec4cd3a3
commit a949b07233
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
vdirsyncer/storage/dav.py
View file

@ -49,6 +49,20 @@ def _parse_xml(content):
'Double-check the URLs in your config.'.format(e)) 'Double-check the URLs in your config.'.format(e))
def _fuzzy_matches_mimetype(strict, weak):
# different servers give different getcontenttypes:
# "text/vcard", "text/x-vcard", "text/x-vcard; charset=utf-8",
# "text/directory;profile=vCard", "text/directory",
# "text/vcard; charset=utf-8"
if strict is None or weak is None:
return True
mediatype, subtype = strict.split('/')
if subtype in weak:
return True
return False
class Discover(object): class Discover(object):
_resourcetype = None _resourcetype = None
_homeset_xml = None _homeset_xml = None
@ -284,6 +298,9 @@ class DavStorage(Storage):
href = href.replace(char, '_') href = href.replace(char, '_')
return self._normalize_href(href + self.fileext) return self._normalize_href(href + self.fileext)
def _is_item_mimetype(self, mimetype):
return _fuzzy_matches_mimetype(self.item_mimetype, mimetype)
def get(self, href): def get(self, href):
((actual_href, item, etag),) = self.get_multi([href]) ((actual_href, item, etag),) = self.get_multi([href])
assert href == actual_href assert href == actual_href
@ -403,8 +420,6 @@ class DavStorage(Storage):
dav_logger.warning('Skipping identical href: {!r}' dav_logger.warning('Skipping identical href: {!r}'
.format(href)) .format(href))
continue continue
else:
hrefs.add(href)
try: try:
prop = response.find('{DAV:}propstat/{DAV:}prop') prop = response.find('{DAV:}propstat/{DAV:}prop')
@ -420,18 +435,13 @@ class DavStorage(Storage):
dav_logger.debug('Skipping {!r}, is collection.'.format(href)) dav_logger.debug('Skipping {!r}, is collection.'.format(href))
continue continue
# different servers give different getcontenttypes: if not self._is_item_mimetype(getattr(contenttype, 'text', None)):
# "text/vcard", "text/x-vcard", "text/x-vcard; charset=utf-8", dav_logger.debug('Skipping {!r}, {!r} != {!r}.'
# "text/directory;profile=vCard", "text/directory", .format(href, contenttype,
# "text/vcard; charset=utf-8" self.item_mimetype))
if self.item_mimetype is not None: continue
mediatype, subtype = self.item_mimetype.split('/')
if contenttype is not None and subtype not in contenttype.text:
dav_logger.debug('Skipping {!r}, {!r} != {!r}.'
.format(href, contenttype,
self.item_mimetype))
continue
hrefs.add(href)
yield href, etag, prop yield href, etag, prop