Merge branch 'master' of ssh+git://git.symlink.me/var/git/pub/cbenz/weboob

Conflicts:
	weboob/tools/application/console.py
This commit is contained in:
Romain Bignon 2010-04-21 00:23:11 +02:00
commit 71e104595a
9 changed files with 128 additions and 27 deletions

View file

@ -65,6 +65,7 @@ class Videoob(ConsoleApplication):
results['BEFORE'] = u'Search pattern: %s' % pattern
else:
results['BEFORE'] = u'Last videos'
results['HEADER'] = ('ID', 'Title', 'Page URL')
for backend in self.weboob.iter_backends():
try:
iterator = backend.iter_search_results(pattern)
@ -73,8 +74,7 @@ class Videoob(ConsoleApplication):
else:
rows = []
for video in iterator:
rows.append(('ID', video.id))
rows.append(('Title', video.title))
rows.append((video.id, video.title, video.page_url))
results[backend.name] = rows
return results