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

WIP

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-12-30 16:45:34 +01:00
parent 0f5bf97174
commit f6f103d1c1
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
vdirsyncer/storage/dav.py
View file

@ -94,6 +94,9 @@ class Discover(object):
def __init__(self, session): def __init__(self, session):
self.session = session self.session = session
def find_principal(self, url):
return list(self._find_principal(url)) or ['']
@_catch_generator_exceptions @_catch_generator_exceptions
def _find_principal(self, url): def _find_principal(self, url):
"""tries to find the principal URL of the user """tries to find the principal URL of the user
@ -126,6 +129,9 @@ class Discover(object):
is_subpath=False) is_subpath=False)
yield response.headers.get('Location', '') yield response.headers.get('Location', '')
def find_dav(self):
return list(self._find_dav()) or ['']
def discover(self): def discover(self):
"""discover all the user's CalDAV or CardDAV collections on the server """discover all the user's CalDAV or CardDAV collections on the server
:returns: a list of the user's collections (as urls) :returns: a list of the user's collections (as urls)
@ -138,7 +144,7 @@ class Discover(object):
# So we just brute-force a lot of paths here. # So we just brute-force a lot of paths here.
done = set() done = set()
for dav in list(self._find_dav()) or ['']: for dav in self.find_dav():
for principal in list(self._find_principal(dav)) or ['']: for principal in list(self._find_principal(dav)) or ['']:
for home in itertools.chain(self._find_homes(principal), ['']): for home in itertools.chain(self._find_homes(principal), ['']):
for collection in self._find_collections(home): for collection in self._find_collections(home):
@ -305,15 +311,19 @@ class DavStorage(Storage):
self.url = url self.url = url
@classmethod @classmethod
def discover(cls, url, **kwargs): def _get_discovery_instance(cls, url, **kwargs):
if kwargs.pop('collection', None) is not None: if kwargs.pop('collection', None) is not None:
raise TypeError('collection argument must not be given.') raise TypeError('collection argument must not be given.')
discover_args, _ = utils.split_dict(kwargs, lambda key: key in ( discover_args, _ = utils.split_dict(kwargs, lambda key: key in (
'username', 'password', 'verify', 'auth', 'useragent', 'username', 'password', 'verify', 'auth', 'useragent',
'verify_fingerprint', 'verify_fingerprint',
)) ))
d = cls.discovery_class(DavSession(url=url, **discover_args)) return cls.discovery_class(DavSession(url=url, **discover_args))
for c in d.discover():
@classmethod
def discover(cls, **kwargs):
for c in cls._get_discovery_instance(**kwargs).discover():
url = c['href'] url = c['href']
_, collection = url.rstrip('/').rsplit('/', 1) _, collection = url.rstrip('/').rsplit('/', 1)
storage_args = {'url': url, 'collection': collection, storage_args = {'url': url, 'collection': collection,
@ -321,6 +331,11 @@ class DavStorage(Storage):
storage_args.update(kwargs) storage_args.update(kwargs)
yield storage_args yield storage_args
@classmethod
def join_collection(cls, **kwargs):
d = cls._get_discovery_instance(**kwargs)
def _normalize_href(self, *args, **kwargs): def _normalize_href(self, *args, **kwargs):
return _normalize_href(self.session.url, *args, **kwargs) return _normalize_href(self.session.url, *args, **kwargs)