Move the "empty search for latest" to collections

There is now a "latest" collection (or "latest_nsfw").
The feature didn't look much used, since it didn't work on many
backends.
Using collections will make it easy to support other things
like most viewed, featured, etc.
As a bonus, I added tests for every backend with the feature.
This commit is contained in:
Laurent Bachelier 2012-03-16 02:55:58 +01:00
commit e958c229e6
32 changed files with 366 additions and 112 deletions

View file

@ -20,7 +20,8 @@
from __future__ import with_statement
from weboob.capabilities.video import ICapVideo
from weboob.capabilities.video import ICapVideo, BaseVideo
from weboob.capabilities.collection import ICapCollection, CollectionNotFound
from weboob.tools.backend import BaseBackend
from .browser import DailymotionBrowser
@ -30,7 +31,7 @@ from .video import DailymotionVideo
__all__ = ['DailymotionBackend']
class DailymotionBackend(BaseBackend, ICapVideo):
class DailymotionBackend(BaseBackend, ICapVideo, ICapCollection):
NAME = 'dailymotion'
MAINTAINER = 'Romain Bignon'
EMAIL = 'romain@weboob.org'
@ -44,7 +45,7 @@ class DailymotionBackend(BaseBackend, ICapVideo):
return self.browser.get_video(_id)
SORTBY = ['relevance', 'rated', 'visited', None]
def search_videos(self, pattern=None, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False, max_results=None):
def search_videos(self, pattern, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False, max_results=None):
with self.browser:
return self.browser.search_videos(pattern, self.SORTBY[sortby])
@ -59,4 +60,21 @@ class DailymotionBackend(BaseBackend, ICapVideo):
return video
def iter_resources(self, objs, split_path):
if BaseVideo in objs:
collection = self.get_collection(objs, split_path)
if collection.path_level == 0:
yield self.get_collection(objs, [u'latest'])
if collection.split_path == [u'latest']:
for video in self.browser.latest_videos():
yield video
def validate_collection(self, objs, collection):
if collection.path_level == 0:
return
if BaseVideo in objs and collection.split_path == [u'latest']:
collection.title = u'Latest Dailymotion videos'
return
raise CollectionNotFound(collection.split_path)
OBJECTS = {DailymotionVideo: fill_video}

View file

@ -47,15 +47,18 @@ class DailymotionBrowser(BaseBrowser):
self.location('/1')
def search_videos(self, pattern, sortby):
if not pattern:
self.home()
pattern = pattern.replace('/', '').encode('utf-8')
if sortby is None:
url = '/search/%s/1' % quote_plus(pattern)
else:
pattern = pattern.replace('/', '').encode('utf-8')
if sortby is None:
url = '/search/%s/1' % quote_plus(pattern)
else:
url = '/%s/search/%s/1' % (sortby, quote_plus(pattern))
self.location(url)
url = '/%s/search/%s/1' % (sortby, quote_plus(pattern))
self.location(url)
assert self.is_on_page(IndexPage)
return self.page.iter_videos()
def latest_videos(self):
self.home()
assert self.is_on_page(IndexPage)
return self.page.iter_videos()

View file

@ -19,14 +19,23 @@
from weboob.tools.test import BackendTest
from weboob.capabilities.video import BaseVideo
class DailymotionTest(BackendTest):
BACKEND = 'dailymotion'
def test_dailymotion(self):
def test_search(self):
l = list(self.backend.search_videos('chirac'))
self.assertTrue(len(l) > 0)
v = l[0]
self.backend.fillobj(v, ('url',))
self.assertTrue(v.url and v.url.startswith('http://'), 'URL for video "%s" not found: %s' % (v.id, v.url))
self.backend.browser.openurl(v.url)
def test_latest(self):
l = list(self.backend.iter_resources([BaseVideo], [u'latest']))
assert len(l)
v = l[0]
self.backend.fillobj(v, ('url',))
self.assertTrue(v.url and v.url.startswith('http://'), 'URL for video "%s" not found: %s' % (v.id, v.url))