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

Add support for ls -d option (closes #858)

Browse source 
This behaves like the UNIX ls -d.
This should solve the use case of Bug #858; ls was never intended to
work that way before. Users can now chose between the two modes (with or
without -d).
This commit is contained in:
Laurent Bachelier 2013-01-09 19:08:58 +01:00 • committed by Romain Bignon
commit 4d1e6f8436
1 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -916,13 +916,17 @@ class ReplApplication(Cmd, ConsoleApplication):
def do_ls(self, line):
"""
ls [PATH]
ls [-d] [PATH]
List objects in current path.
If an argument is given, list the specified path.
"""
path = line.strip()
if line.strip().partition(' ')[0] == '-d':
path = None
only = line.strip().partition(' ')[2]
else:
path = line.strip()
only = False
if path:
# We have an argument, let's ch to the directory before the ls
@ -933,18 +937,20 @@ class ReplApplication(Cmd, ConsoleApplication):
self.start_format()
self.objects = []
for obj in objects:
if isinstance(obj, CapBaseObject):
self.cached_format(obj)
else:
print obj
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
for collection in collections:
if collection.basename and collection.title:
print u'%s~ (%s) %s (%s)%s' % \
(self.BOLD, collection.basename, collection.title, collection.backend, self.NC)
else:
print u'%s~ (%s) (%s)%s' % \
(self.BOLD, collection.basename, collection.backend, self.NC)
if only is False or collection.basename in only:
if collection.basename and collection.title:
print u'%s~ (%s) %s (%s)%s' % \
(self.BOLD, collection.basename, collection.title, collection.backend, self.NC)
else:
print u'%s~ (%s) (%s)%s' % \
(self.BOLD, collection.basename, collection.backend, self.NC)
if path:
# Let's go back to the parent directory