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

Move methods around for legibility

Browse source
This commit is contained in:
Markus Unterwaditzer 2015-01-02 22:36:37 +01:00
parent eef269507f
commit 8178e5ff67
1 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
vdirsyncer/storage/dav.py
View file

@ -104,6 +104,16 @@ class Discover(object):
def __init__(self, session):
self.session = session
def find_dav(self):
return list(self._find_dav()) or ['']
@_catch_generator_exceptions
def _find_dav(self):
response = self.session.request('GET', self._well_known_uri,
allow_redirects=False,
is_subpath=False)
yield response.headers.get('Location', '')
def find_principal(self):
for server in self.find_dav():
for x in list(self._find_principal(server)) or ['']:
@ -133,30 +143,6 @@ class Discover(object):
# should be only one
yield principal.text
def find_dav(self):
return list(self._find_dav()) or ['']
@_catch_generator_exceptions
def _find_dav(self):
response = self.session.request('GET', self._well_known_uri,
allow_redirects=False,
is_subpath=False)
yield response.headers.get('Location', '')
def discover(self):
"""discover all the user's CalDAV or CardDAV collections on the server
:returns: a list of the user's collections (as urls)
:rtype: list(unicode)
"""
done = set()
for collection in self.find_collections():
collection['href'] = href = \
utils.urlparse.urljoin(self.session.url, collection['href'])
if href not in done:
done.add(href)
yield collection
def find_homes(self):
for principal in self.find_principal():
for x in self._find_homes(principal):
@ -202,6 +188,20 @@ class Discover(object):
yield collection
def discover(self):
"""discover all the user's CalDAV or CardDAV collections on the server
:returns: a list of the user's collections (as urls)
:rtype: list(unicode)
"""
done = set()
for collection in self.find_collections():
collection['href'] = href = \
utils.urlparse.urljoin(self.session.url, collection['href'])
if href not in done:
done.add(href)
yield collection
class CalDiscover(Discover):
_resourcetype = 'calendar'