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:
parent
4d628112d5
commit
e958c229e6
32 changed files with 366 additions and 112 deletions
|
|
@ -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 PluzzBrowser
|
||||
|
|
@ -30,7 +31,7 @@ from .video import PluzzVideo
|
|||
__all__ = ['PluzzBackend']
|
||||
|
||||
|
||||
class PluzzBackend(BaseBackend, ICapVideo):
|
||||
class PluzzBackend(BaseBackend, ICapVideo, ICapCollection):
|
||||
NAME = 'francetelevisions'
|
||||
MAINTAINER = 'Romain Bignon'
|
||||
EMAIL = 'romain@weboob.org'
|
||||
|
|
@ -43,7 +44,7 @@ class PluzzBackend(BaseBackend, ICapVideo):
|
|||
with self.browser:
|
||||
return self.browser.get_video(_id)
|
||||
|
||||
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)
|
||||
|
||||
|
|
@ -58,4 +59,21 @@ class PluzzBackend(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 France Télévisions videos'
|
||||
return
|
||||
raise CollectionNotFound(collection.split_path)
|
||||
|
||||
OBJECTS = {PluzzVideo: fill_video}
|
||||
|
|
|
|||
|
|
@ -59,10 +59,13 @@ class PluzzBrowser(BaseBrowser):
|
|||
self.location('/replay/1')
|
||||
|
||||
def search_videos(self, pattern):
|
||||
if not pattern:
|
||||
self.home()
|
||||
else:
|
||||
self.location(self.buildurl('/recherche.html', q=pattern.encode('utf-8')))
|
||||
self.location(self.buildurl('/recherche.html', q=pattern.encode('utf-8')))
|
||||
|
||||
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()
|
||||
|
|
@ -79,11 +82,11 @@ class PluzzBrowser(BaseBrowser):
|
|||
|
||||
for vid in root.find('videos'):
|
||||
if vid.findtext('statut') == 'ONLINE' and vid.findtext('format') == 'wmv':
|
||||
video.url = vid.findtext('url')
|
||||
video.url = vid.findtext('url')
|
||||
|
||||
date = root.findtext('diffusions/diffusion')
|
||||
if date:
|
||||
video.date = datetime.datetime.strptime(date, '%d/%m/%Y %H:%M')
|
||||
video.date = datetime.datetime.strptime(date, '%d/%m/%Y %H:%M')
|
||||
|
||||
video.description = root.findtext('synopsis')
|
||||
|
||||
|
|
|
|||
|
|
@ -19,14 +19,22 @@
|
|||
|
||||
|
||||
from weboob.tools.test import BackendTest
|
||||
from weboob.capabilities.video import BaseVideo
|
||||
|
||||
class PluzzTest(BackendTest):
|
||||
BACKEND = 'francetelevisions'
|
||||
|
||||
def test_francetelevisions(self):
|
||||
def test_search(self):
|
||||
# If the test fails, it might be good news!
|
||||
l = list(self.backend.search_videos('Plus belle la vie'))
|
||||
self.assertTrue(len(l) > 0)
|
||||
v = l[0]
|
||||
self.backend.fillobj(v, ('url',))
|
||||
self.assertTrue(v.url and v.url.startswith('mms://'), 'URL for video "%s" not found: %s' % (v.id, 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',))
|
||||
assert v.url
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue