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

add merge option and some sorting

Browse source
This commit is contained in:
Christophe Benz 2010-04-27 15:19:51 +02:00 • committed by Romain Bignon
commit c89ba43d07
2 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
weboob/frontends/videoob_web/application.py
View file

@ -71,17 +71,25 @@ class VideoobWeb(BaseApplication):
nsfw = req.params.get('nsfw')
nsfw = False if not nsfw or nsfw == '0' else True
q = req.params.get('q', u'')
merge = req.params.get('merge')
merge = False if not merge or merge == '0' else True
c['merge'] = merge
c['form_data'] = dict(q=q)
c['results'] = {}
c['results'] = [] if merge else {}
if q:
for backend in self.weboob.iter_backends():
items = [dict(title=video.title,
videos = [dict(title=video.title,
page_url=video.page_url,
url=video.url if video.url else '/download?id=%s' % video.id
) \
for video in backend.iter_search_results(pattern=q, nsfw=nsfw)]
if items:
c['results'][backend.name] = items
if videos:
if merge:
c['results'].extend(videos)
else:
c['results'][backend.name] = videos
if merge:
c['results'] = sorted(c['results'], key=lambda video: video['title'].lower())
template = template_lookup.get_template('index.mako')
buf = StringIO()
ctx = Context(buf, **c)