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

ls: display collections before objects

Browse source
This commit is contained in:
Romain Bignon 2013-07-27 23:38:14 +02:00
commit 4c4fb24291
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -949,15 +949,9 @@ class ReplApplication(Cmd, ConsoleApplication):
objects, collections = self._fetch_objects(objs=self.COLLECTION_OBJECTS)
self.start_format()
self.objects = []
for obj in objects:
if only is False or not hasattr(obj, 'id') or obj.id in only:
if isinstance(obj, CapBaseObject):
self.cached_format(obj)
else:
print obj
self.start_format()
for collection in collections:
if only is False or collection.basename in only:
if collection.basename and collection.title:
@ -967,6 +961,13 @@ class ReplApplication(Cmd, ConsoleApplication):
print u'%s~ (%s) (%s)%s' % \
(self.BOLD, collection.basename, collection.backend, self.NC)
for obj in objects:
if only is False or not hasattr(obj, 'id') or obj.id in only:
if isinstance(obj, CapBaseObject):
self.cached_format(obj)
else:
print obj
if path:
# Let's go back to the parent directory
self.working_path.restore()