nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make collection validation more powerful

Browse source 
Handle and use exceptions.
An example is provided with the redmine backend (not very useful
though). If you cd into the project title instead of the id, it is
accepted and the path is corrected.
This commit is contained in:
Laurent Bachelier 2012-03-11 00:59:35 +01:00
commit e70a125ab9
3 changed files with 44 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

28
weboob/tools/application/repl.py
View file

@ -893,10 +893,23 @@ class ReplApplication(Cmd, ConsoleApplication):
else:
self.working_path.cd1(line)
collections = [res for backend, res in self.do('get_collection',
objs=self.COLLECTION_OBJECTS, split_path=self.working_path.get(),
caps=ICapCollection) if res is not None]
collections = []
try:
for backend, res in self.do('get_collection',
objs=self.COLLECTION_OBJECTS, split_path=self.working_path.get(),
caps=ICapCollection):
if res:
collections.append(res)
except CallErrors, errors:
for backend, error, backtrace in errors.errors:
if isinstance(error, CollectionNotFound):
pass
else:
self.bcall_error_handler(backend, error, backtrace)
if len(collections):
# update the path from the collection if possible
if len(collections) == 1:
self.working_path.split_path = collections[0].split_path
self._change_prompt()
else:
print >>sys.stderr, u"Path: %s not found" % unicode(self.working_path)
@ -933,7 +946,14 @@ class ReplApplication(Cmd, ConsoleApplication):
offs = len(mline) - len(text)
if len(self.collections) == 0:
self.objects, self.collections = self._fetch_objects(objs=self.COLLECTION_OBJECTS)
try:
self.objects, self.collections = self._fetch_objects(objs=self.COLLECTION_OBJECTS)
except CallErrors, errors:
for backend, error, backtrace in errors.errors:
if isinstance(error, CollectionNotFound):
pass
else:
self.bcall_error_handler(backend, error, backtrace)
for collection in self.collections:
directories.add(collection.id.encode(sys.stdout.encoding or locale.getpreferredencoding()))