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

Move the "empty search for latest" to collections

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

24
modules/youporn/backend.py
View file

@ -20,8 +20,9 @@
from __future__ import with_statement
from weboob.capabilities.video import ICapVideo
from weboob.capabilities.video import ICapVideo, BaseVideo
from weboob.tools.backend import BaseBackend
from weboob.capabilities.collection import ICapCollection, CollectionNotFound
from .browser import YoupornBrowser
from .video import YoupornVideo
@ -30,7 +31,7 @@ from .video import YoupornVideo
__all__ = ['YoupornBackend']
class YoupornBackend(BaseBackend, ICapVideo):
class YoupornBackend(BaseBackend, ICapVideo, ICapCollection):
NAME = 'youporn'
MAINTAINER = 'Romain Bignon'
EMAIL = 'romain@weboob.org'
@ -45,7 +46,7 @@ class YoupornBackend(BaseBackend, ICapVideo):
SORTBY = ['relevance', 'rating', 'views', 'time']
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):
if not nsfw:
return set()
with self.browser:
@ -62,4 +63,21 @@ class YoupornBackend(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_nsfw'])
if collection.split_path == [u'latest_nsfw']:
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_nsfw']:
collection.title = u'Latest YouPorn videos (NSFW)'
return
raise CollectionNotFound(collection.split_path)
OBJECTS = {YoupornVideo: fill_video}