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

rename iter_search_results to either search_videos and search_gallery (closes #779)

Browse source
This commit is contained in:
Romain Bignon 2012-03-12 16:18:14 +01:00
commit 56691d7ea7
39 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/youporn/backend.py
View file

@ -44,11 +44,11 @@ class YoupornBackend(BaseBackend, ICapVideo):
return self.browser.get_video(_id)
SORTBY = ['relevance', 'rating', 'views', 'time']
def iter_search_results(self, pattern=None, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False, max_results=None):
def search_videos(self, pattern=None, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False, max_results=None):
if not nsfw:
return set()
with self.browser:
return self.browser.iter_search_results(pattern, self.SORTBY[sortby])
return self.browser.search_videos(pattern, self.SORTBY[sortby])
def fill_video(self, video, fields):
if fields != ['thumbnail']:

2
modules/youporn/browser.py
View file

@ -43,7 +43,7 @@ class YoupornBrowser(BaseBrowser):
self.location(url)
return self.page.get_video(video)
def iter_search_results(self, pattern, sortby):
def search_videos(self, pattern, sortby):
if not pattern:
self.home()
else:

4
modules/youporn/test.py
View file

@ -24,9 +24,9 @@ class YoupornTest(BackendTest):
BACKEND = 'youporn'
def test_youporn(self):
self.assertTrue(len(self.backend.iter_search_results('penis', nsfw=False)) == 0)
self.assertTrue(len(self.backend.search_videos('penis', nsfw=False)) == 0)
l = list(self.backend.iter_search_results('ass to mouth', nsfw=True))
l = list(self.backend.search_videos('ass to mouth', nsfw=True))
self.assertTrue(len(l) > 0)
v = l[0]
self.backend.fillobj(v, ('url',))