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

Ability to pass homeset-url for DAV storage (#511)

Browse source 
See #509
This commit is contained in:
Markus Unterwaditzer 2016-09-29 18:49:41 +02:00 committed by GitHub
parent c9d92ea6eb
commit aede90eee9
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
vdirsyncer/storage/dav.py
View file

@ -145,10 +145,7 @@ class Discover(object):
def find_principal(self, url=None): def find_principal(self, url=None):
if url is None: if url is None:
try: url = self.find_dav()
return self.find_principal('')
except (HTTPError, exceptions.Error):
return self.find_principal(self.find_dav())
headers = self.session.get_default_headers() headers = self.session.get_default_headers()
headers['Depth'] = '0' headers['Depth'] = '0'
@ -191,7 +188,18 @@ class Discover(object):
def find_collections(self, url=None): def find_collections(self, url=None):
if url is None: if url is None:
url = self.find_home() rv = None
try:
rv = list(self.find_collections(''))
except (HTTPError, exceptions.Error):
pass
if rv:
yield from rv
return
dav_logger.debug('Given URL is not a homeset URL')
return self.find_collections(self.find_home())
headers = self.session.get_default_headers() headers = self.session.get_default_headers()
headers['Depth'] = '1' headers['Depth'] = '1'
r = self.session.request('PROPFIND', url, headers=headers, r = self.session.request('PROPFIND', url, headers=headers,