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

implement max_results option and infinite search for youtube

Browse source
This commit is contained in:
Christophe Benz 2010-08-11 21:35:20 +02:00
commit 53f6571fee
7 changed files with 82 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

5
weboob/tools/application/base.py
View file

@ -23,7 +23,7 @@ from optparse import OptionGroup, OptionParser
from weboob.core.ouiboube import Weboob
from weboob.tools.config.iconfig import ConfigError
from weboob.tools.backend import ObjectNotSupported
from weboob.tools.backend import ObjectNotAvailable, ObjectNotSupported
from weboob.tools.misc import iter_fields
@ -201,7 +201,7 @@ class BaseApplication(object):
fields = [k for k, v in iter_fields(obj)]
try:
backend.fillobj(obj, fields)
except ObjectNotSupported, e:
except (ObjectNotAvailable, ObjectNotSupported), e:
logging.warning(u'Could not retrieve required fields (%s): %s' % (','.join(fields), e))
return obj
@ -213,6 +213,7 @@ class BaseApplication(object):
yield sub
def complete(self, backend, count, selected_fields, function, *args, **kwargs):
assert count is None or count > 0
res = getattr(backend, function)(*args, **kwargs)
if self.selected_fields:

12
weboob/tools/application/console.py
View file

@ -29,6 +29,7 @@ import sys
from weboob.core import CallErrors
from weboob.core.backends import BackendsConfig
from weboob.tools.backend import ObjectNotSupported
from .base import BackendNotFound, BaseApplication
from .formatters.load import formatters, load_formatter
@ -69,12 +70,14 @@ class ConsoleApplication(BaseApplication):
results_options = OptionGroup(self._parser, 'Results Options')
results_options.add_option('-c', '--condition', help='filter result items to display given a boolean condition')
results_options.add_option('-n', '--count', type='int', help='get a maximum number of results (all backends merged)')
results_options.add_option('-n', '--count', default='10', type='int',
help='get a maximum number of results (all backends merged)')
results_options.add_option('-s', '--select', help='select result item keys to display (comma separated)')
self._parser.add_option_group(results_options)
formatting_options = OptionGroup(self._parser, 'Formatting Options')
formatting_options.add_option('-f', '--formatter', choices=formatters, help='select output formatter (%s)' % u','.join(formatters))
formatting_options.add_option('-f', '--formatter', choices=formatters,
help='select output formatter (%s)' % u','.join(formatters))
formatting_options.add_option('--no-header', dest='no_header', action='store_true', help='do not display header')
formatting_options.add_option('--no-keys', dest='no_keys', action='store_true', help='do not display item keys')
self._parser.add_option_group(formatting_options)
@ -106,6 +109,11 @@ class ConsoleApplication(BaseApplication):
else:
self.condition = None
if self.options.count == 0:
self._parser.error('Count must be at least 1, or negative for infinite')
elif self.options.count < 0:
self.options.count = None
def _get_completions(self):
return set(name for name, arguments, doc_string in self._commands)