diff --git a/contrib/videoob_web/videoob_web/videoob_web.py b/contrib/videoob_web/videoob_web/videoob_web.py index 3716f434..8f90ceec 100644 --- a/contrib/videoob_web/videoob_web/videoob_web.py +++ b/contrib/videoob_web/videoob_web/videoob_web.py @@ -101,7 +101,7 @@ class VideoobWeb(BaseApplication): url=video.url if video.url else '/download?id=%s' % video.id, thumbnail_url=video.thumbnail.url, ) \ - for video in backend.iter_search_results(pattern=q, nsfw=nsfw)] + for video in backend.search_videos(pattern=q, nsfw=nsfw)] if videos: if merge: c['results'].extend(videos) diff --git a/modules/arte/backend.py b/modules/arte/backend.py index 2636ed65..12339d52 100644 --- a/modules/arte/backend.py +++ b/modules/arte/backend.py @@ -50,9 +50,9 @@ class ArteBackend(BaseBackend, ICapVideo): with self.browser: return self.browser.get_video(_id) - 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): with self.browser: - return self.browser.iter_search_results(pattern) + return self.browser.search_videos(pattern) def fill_video(self, video, fields): if fields != ['thumbnail']: diff --git a/modules/arte/browser.py b/modules/arte/browser.py index f730584a..7b1dab0c 100644 --- a/modules/arte/browser.py +++ b/modules/arte/browser.py @@ -51,7 +51,7 @@ class ArteBrowser(BaseBrowser): def home(self): self.location('http://videos.arte.tv/fr/videos/arte7') - def iter_search_results(self, pattern): + def search_videos(self, pattern): if not pattern: self.home() else: diff --git a/modules/arte/test.py b/modules/arte/test.py index 3e29c576..ec9926ab 100644 --- a/modules/arte/test.py +++ b/modules/arte/test.py @@ -24,7 +24,7 @@ class ArteTest(BackendTest): BACKEND = 'arte' def test_arte(self): - l = list(self.backend.iter_search_results('arte')) + l = list(self.backend.search_videos('arte')) if len(l) > 0: v = l[0] self.backend.fillobj(v, ('url',)) diff --git a/modules/canalplus/backend.py b/modules/canalplus/backend.py index 5a17709f..bda9967b 100644 --- a/modules/canalplus/backend.py +++ b/modules/canalplus/backend.py @@ -48,9 +48,9 @@ class CanalplusBackend(BaseBackend, ICapVideo, ICapCollection): def create_default_browser(self): return self.create_browser(quality=self.config['quality'].get()) - 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): with self.browser: - return self.browser.iter_search_results(pattern) + return self.browser.search_videos(pattern) def get_video(self, _id): m = re.match('https?://www\.canal-?plus\.fr/.*\?vid=(\d+)', _id) diff --git a/modules/canalplus/browser.py b/modules/canalplus/browser.py index 117a6bd5..f59e117a 100644 --- a/modules/canalplus/browser.py +++ b/modules/canalplus/browser.py @@ -69,7 +69,7 @@ class CanalplusBrowser(BaseBrowser): def home(self): self.location('http://service.canal-plus.com/video/rest/initPlayer/cplus/') - def iter_search_results(self, pattern): + def search_videos(self, pattern): self.location('http://service.canal-plus.com/video/rest/search/cplus/' + urllib.quote_plus(pattern.replace('/', '').encode('utf-8'))) return self.page.iter_results() diff --git a/modules/canalplus/test.py b/modules/canalplus/test.py index 09fdb0fe..69b80356 100644 --- a/modules/canalplus/test.py +++ b/modules/canalplus/test.py @@ -25,7 +25,7 @@ class CanalPlusTest(BackendTest): BACKEND = 'canalplus' def test_canalplus(self): - l = list(self.backend.iter_search_results('guignol')) + l = list(self.backend.search_videos('guignol')) self.assertTrue(len(l) > 0) v = l[0] self.backend.fillobj(v, ('url',)) diff --git a/modules/cappedtv/backend.py b/modules/cappedtv/backend.py index 88158614..fefc4203 100644 --- a/modules/cappedtv/backend.py +++ b/modules/cappedtv/backend.py @@ -30,9 +30,9 @@ class CappedBackend(BaseBackend, ICapVideo): with self.browser: return self.browser.get_video(_id) - def iter_search_results(self, pattern=None, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=None, max_results=None): + def search_videos(self, pattern=None, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=None, max_results=None): with self.browser: - return self.browser.iter_search_results(pattern) + return self.browser.search_videos(pattern) def fill_video(self, video, fields): if fields != ['thumbnail']: diff --git a/modules/cappedtv/browser.py b/modules/cappedtv/browser.py index f53658b4..69f270fa 100644 --- a/modules/cappedtv/browser.py +++ b/modules/cappedtv/browser.py @@ -118,7 +118,7 @@ class CappedBrowser(BaseBrowser): assert self.is_on_page(VideoPage), 'Should be on video page.' return self.page.get_video(video) - def iter_search_results(self,pattern): + def search_videos(self,pattern): if not pattern: self.home() else: diff --git a/modules/cappedtv/test.py b/modules/cappedtv/test.py index bcb0ec06..1278b60b 100644 --- a/modules/cappedtv/test.py +++ b/modules/cappedtv/test.py @@ -19,7 +19,7 @@ class CappedTest(BackendTest): BACKEND = 'cappedtv' def test_capped(self): - l = list(self.backend.iter_search_results('kewlers')) + l = list(self.backend.search_videos('kewlers')) self.assertTrue(len(l) > 0) v = l[0] self.backend.fillobj(v, ('url',)) diff --git a/modules/dailymotion/backend.py b/modules/dailymotion/backend.py index 01deb6a8..e7ff4c70 100644 --- a/modules/dailymotion/backend.py +++ b/modules/dailymotion/backend.py @@ -44,9 +44,9 @@ class DailymotionBackend(BaseBackend, ICapVideo): return self.browser.get_video(_id) SORTBY = ['relevance', 'rated', 'visited', None] - 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): 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']: diff --git a/modules/dailymotion/browser.py b/modules/dailymotion/browser.py index 97de46f4..4ab8b71d 100644 --- a/modules/dailymotion/browser.py +++ b/modules/dailymotion/browser.py @@ -42,7 +42,7 @@ class DailymotionBrowser(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: diff --git a/modules/dailymotion/test.py b/modules/dailymotion/test.py index c7f7f796..af7a9f16 100644 --- a/modules/dailymotion/test.py +++ b/modules/dailymotion/test.py @@ -24,7 +24,7 @@ class DailymotionTest(BackendTest): BACKEND = 'dailymotion' def test_dailymotion(self): - l = list(self.backend.iter_search_results('chirac')) + l = list(self.backend.search_videos('chirac')) self.assertTrue(len(l) > 0) v = l[0] self.backend.fillobj(v, ('url',)) diff --git a/modules/ehentai/backend.py b/modules/ehentai/backend.py index f43d900b..1d2aedf3 100644 --- a/modules/ehentai/backend.py +++ b/modules/ehentai/backend.py @@ -53,9 +53,9 @@ class EHentaiBackend(BaseBackend, ICapGallery): password = None return self.create_browser(self.config['domain'].get(), username, password) - def iter_search_results(self, pattern=None, sortby=None, max_results=None): + def search_gallery(self, pattern=None, sortby=None, max_results=None): with self.browser: - return self.browser.iter_search_results(pattern) + return self.browser.search_gallery(pattern) def iter_gallery_images(self, gallery): self.fillobj(gallery, ('url',)) @@ -74,7 +74,7 @@ class EHentaiBackend(BaseBackend, ICapGallery): _id = match.group(0) else: return None - + gallery = EHentaiGallery(_id) with self.browser: if self.browser.gallery_exists(gallery): diff --git a/modules/ehentai/browser.py b/modules/ehentai/browser.py index d755a41c..e70292b4 100644 --- a/modules/ehentai/browser.py +++ b/modules/ehentai/browser.py @@ -51,7 +51,7 @@ class EHentaiBrowser(BaseBrowser): def _gallery_page(self, gallery, n): return gallery.url + ('?p=%d' % n) - def iter_search_results(self, pattern): + def search_gallery(self, pattern): self.location(self.buildurl('/', f_search=pattern.encode('utf-8'))) assert self.is_on_page(IndexPage) return self.page.iter_galleries() diff --git a/modules/ehentai/test.py b/modules/ehentai/test.py index 014af2c4..f59ed3b6 100644 --- a/modules/ehentai/test.py +++ b/modules/ehentai/test.py @@ -24,7 +24,7 @@ class EHentaiTest(BackendTest): BACKEND = 'ehentai' def test_ehentai(self): - l = list(self.backend.iter_search_results('lol')) + l = list(self.backend.search_gallery('lol')) self.assertTrue(len(l) > 0) v = l[0] self.backend.fillobj(v, ('url',)) diff --git a/modules/francetelevisions/backend.py b/modules/francetelevisions/backend.py index 86082ade..04130dd3 100644 --- a/modules/francetelevisions/backend.py +++ b/modules/francetelevisions/backend.py @@ -43,9 +43,9 @@ class PluzzBackend(BaseBackend, ICapVideo): with self.browser: return self.browser.get_video(_id) - 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): with self.browser: - return self.browser.iter_search_results(pattern) + return self.browser.search_videos(pattern) def fill_video(self, video, fields): if fields != ['thumbnail']: diff --git a/modules/francetelevisions/browser.py b/modules/francetelevisions/browser.py index 4d4efb2b..5c15eb8a 100644 --- a/modules/francetelevisions/browser.py +++ b/modules/francetelevisions/browser.py @@ -55,7 +55,7 @@ class PluzzBrowser(BaseBrowser): return video - def iter_search_results(self, pattern): + def search_videos(self, pattern): if not pattern: self.home() else: diff --git a/modules/francetelevisions/test.py b/modules/francetelevisions/test.py index b5aa9860..d0c1896d 100644 --- a/modules/francetelevisions/test.py +++ b/modules/francetelevisions/test.py @@ -25,7 +25,7 @@ class PluzzTest(BackendTest): def test_francetelevisions(self): # If the test fails, it might be good news! - l = list(self.backend.iter_search_results('Plus belle la vie')) + l = list(self.backend.search_videos('Plus belle la vie')) self.assertTrue(len(l) > 0) v = l[0] self.backend.fillobj(v, ('url',)) diff --git a/modules/ina/backend.py b/modules/ina/backend.py index f9710c9e..6e5fa712 100644 --- a/modules/ina/backend.py +++ b/modules/ina/backend.py @@ -42,9 +42,9 @@ class InaBackend(BaseBackend, ICapVideo): def get_video(self, _id): return self.browser.get_video(_id) - 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): with self.browser: - return self.browser.iter_search_results(pattern) + return self.browser.search_videos(pattern) def fill_video(self, video, fields): return video diff --git a/modules/ina/browser.py b/modules/ina/browser.py index 0805484b..83a22b56 100644 --- a/modules/ina/browser.py +++ b/modules/ina/browser.py @@ -41,7 +41,7 @@ class InaBrowser(BaseBrowser): self.location(url) return self.page.get_video(video) - def iter_search_results(self, pattern): + def search_videos(self, pattern): self.location(self.buildurl('http://boutique.ina.fr/recherche/recherche', search=pattern.encode('utf-8'))) assert self.is_on_page(SearchPage) return self.page.iter_videos() diff --git a/modules/ina/test.py b/modules/ina/test.py index 7146befe..b8156cae 100644 --- a/modules/ina/test.py +++ b/modules/ina/test.py @@ -24,7 +24,7 @@ class INATest(BackendTest): BACKEND = 'ina' def test_ina(self): - l = list(self.backend.iter_search_results('chirac')) + l = list(self.backend.search_videos('chirac')) self.assertTrue(len(l) > 0) v = l[0] self.backend.fillobj(v, ('url',)) diff --git a/modules/nolifetv/backend.py b/modules/nolifetv/backend.py index e0f0ff82..41fe3df3 100644 --- a/modules/nolifetv/backend.py +++ b/modules/nolifetv/backend.py @@ -55,9 +55,9 @@ class NolifeTVBackend(BaseBackend, ICapVideo): video = self.browser.get_video(_id) return video - 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): with self.browser: - return self.browser.iter_search_results(pattern) + return self.browser.search_videos(pattern) def fill_video(self, video, fields): if fields != ['thumbnail']: diff --git a/modules/nolifetv/browser.py b/modules/nolifetv/browser.py index 300d2f09..b8cb1006 100644 --- a/modules/nolifetv/browser.py +++ b/modules/nolifetv/browser.py @@ -69,7 +69,7 @@ class NolifeTVBrowser(BaseBrowser): assert self.is_on_page(VideoPage), 'Should be on video page.' return self.page.get_video(video) - def iter_search_results(self, pattern): + def search_videos(self, pattern): if not pattern: self.home() else: diff --git a/modules/nolifetv/test.py b/modules/nolifetv/test.py index 531d002f..8443c834 100644 --- a/modules/nolifetv/test.py +++ b/modules/nolifetv/test.py @@ -25,7 +25,7 @@ class NolifeTVTest(BackendTest): BACKEND = 'nolifetv' def test_nolife(self): - l = list(self.backend.iter_search_results('nolife')) + l = list(self.backend.search_videos('nolife')) self.assertTrue(len(l) > 0) for v in l: try: diff --git a/modules/radiofrance/backend.py b/modules/radiofrance/backend.py index 856f8e8d..01ca6e0a 100644 --- a/modules/radiofrance/backend.py +++ b/modules/radiofrance/backend.py @@ -175,7 +175,7 @@ class RadioFranceBackend(BaseBackend, ICapRadio, ICapCollection, ICapVideo): # TODO # http://www.franceculture.fr/recherche/key%3DYOURSEARCH%2526type%3Demission # http://www.franceinter.fr/recherche/key%3DYOURSEARCH%2526tri%3Dpertinence%2526theme%3Ddefault%2526type%3Demission - #def iter_search_results(self, *args, **kwargs): + #def search_videos(self, *args, **kwargs): # return [] def get_video(self, _id): diff --git a/modules/youjizz/backend.py b/modules/youjizz/backend.py index 94030802..a42357f5 100644 --- a/modules/youjizz/backend.py +++ b/modules/youjizz/backend.py @@ -44,11 +44,11 @@ class YoujizzBackend(BaseBackend, ICapVideo): video = self.browser.get_video(_id) return video - 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) + return self.browser.search_videos(pattern) def fill_video(self, video, fields): if fields != ['thumbnail']: diff --git a/modules/youjizz/browser.py b/modules/youjizz/browser.py index 10bc61d4..be78630a 100644 --- a/modules/youjizz/browser.py +++ b/modules/youjizz/browser.py @@ -46,7 +46,7 @@ class YoujizzBrowser(BaseBrowser): assert self.is_on_page(VideoPage), 'Should be on video page.' return self.page.get_video(video) - def iter_search_results(self, pattern): + def search_videos(self, pattern): if not pattern: self.home() else: diff --git a/modules/youjizz/test.py b/modules/youjizz/test.py index ea0ad493..8cdfb371 100644 --- a/modules/youjizz/test.py +++ b/modules/youjizz/test.py @@ -24,9 +24,9 @@ class YoujizzTest(BackendTest): BACKEND = 'youjizz' def test_youjizz(self): - self.assertTrue(len(self.backend.iter_search_results('anus', nsfw=False)) == 0) + self.assertTrue(len(self.backend.search_videos('anus', nsfw=False)) == 0) - l = list(self.backend.iter_search_results('sex', nsfw=True)) + l = list(self.backend.search_videos('sex', nsfw=True)) self.assertTrue(len(l) > 0) v = l[0] self.backend.fillobj(v, ('url',)) diff --git a/modules/youporn/backend.py b/modules/youporn/backend.py index 46415ce4..9db873e0 100644 --- a/modules/youporn/backend.py +++ b/modules/youporn/backend.py @@ -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']: diff --git a/modules/youporn/browser.py b/modules/youporn/browser.py index 2ce32187..70a151ab 100644 --- a/modules/youporn/browser.py +++ b/modules/youporn/browser.py @@ -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: diff --git a/modules/youporn/test.py b/modules/youporn/test.py index c3f43a1f..f1de56d3 100644 --- a/modules/youporn/test.py +++ b/modules/youporn/test.py @@ -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',)) diff --git a/modules/youtube/backend.py b/modules/youtube/backend.py index d788958e..ebf87496 100644 --- a/modules/youtube/backend.py +++ b/modules/youtube/backend.py @@ -106,7 +106,7 @@ class YoutubeBackend(BaseBackend, ICapVideo): self._set_video_url(video) return video - 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): YOUTUBE_MAX_RESULTS = 50 YOUTUBE_MAX_START_INDEX = 1000 yt_service = gdata.youtube.service.YouTubeService() diff --git a/modules/youtube/test.py b/modules/youtube/test.py index 8233c2f0..6fb87037 100644 --- a/modules/youtube/test.py +++ b/modules/youtube/test.py @@ -24,7 +24,7 @@ class YoutubeTest(BackendTest): BACKEND = 'youtube' def test_youtube(self): - l = list(self.backend.iter_search_results('lol')) + l = list(self.backend.search_videos('lol')) self.assertTrue(len(l) > 0) v = l[0] self.backend.fillobj(v, ('url',)) diff --git a/weboob/applications/galleroob/galleroob.py b/weboob/applications/galleroob/galleroob.py index d354b8a1..80c945bf 100644 --- a/weboob/applications/galleroob/galleroob.py +++ b/weboob/applications/galleroob/galleroob.py @@ -74,7 +74,7 @@ class Galleroob(ReplApplication): self.set_formatter_header(u'Search pattern: %s' % pattern if pattern else u'Latest galleries') - for backend, gallery in self.do('iter_search_results', + for backend, gallery in self.do('search_gallery', pattern=pattern, max_results=self.options.count): self.add_object(gallery) self.format(gallery) diff --git a/weboob/applications/qvideoob/main_window.py b/weboob/applications/qvideoob/main_window.py index 6dacdfa4..06141f7a 100644 --- a/weboob/applications/qvideoob/main_window.py +++ b/weboob/applications/qvideoob/main_window.py @@ -108,7 +108,7 @@ class MainWindow(QtMainWindow): backend_name = str(self.ui.backendEdit.itemData(self.ui.backendEdit.currentIndex()).toString()) self.process = QtDo(self.weboob, self.addVideo) - self.process.do('iter_search_results', pattern, self.ui.sortbyEdit.currentIndex(), nsfw=True, max_results=20, backends=backend_name) + self.process.do('search_videos', pattern, self.ui.sortbyEdit.currentIndex(), nsfw=True, max_results=20, backends=backend_name) def addVideo(self, backend, video): if not backend: diff --git a/weboob/applications/videoob/videoob.py b/weboob/applications/videoob/videoob.py index 6f777331..67611c55 100644 --- a/weboob/applications/videoob/videoob.py +++ b/weboob/applications/videoob/videoob.py @@ -224,7 +224,7 @@ class Videoob(ReplApplication): self.set_formatter_header(u'Search pattern: %s' % pattern if pattern else u'Latest videos') self.change_path('/search') - for backend, video in self.do('iter_search_results', pattern=pattern, nsfw=self.nsfw, + for backend, video in self.do('search_videos', pattern=pattern, nsfw=self.nsfw, max_results=self.options.count): self.add_object(video) self.format(video) diff --git a/weboob/capabilities/gallery.py b/weboob/capabilities/gallery.py index a546f238..afe3f652 100644 --- a/weboob/capabilities/gallery.py +++ b/weboob/capabilities/gallery.py @@ -86,7 +86,7 @@ class ICapGallery(IBaseCap): SEARCH_VIEWS, SEARCH_DATE) = range(4) - def iter_search_results(self, pattern=None, sortby=SEARCH_RELEVANCE, max_results=None): + def search_gallery(self, pattern=None, sortby=SEARCH_RELEVANCE, max_results=None): """ Iter results of a search on a pattern. Note that if pattern is None, it get the latest videos. diff --git a/weboob/capabilities/video.py b/weboob/capabilities/video.py index 4d5c5c32..bf4bb27d 100644 --- a/weboob/capabilities/video.py +++ b/weboob/capabilities/video.py @@ -70,7 +70,7 @@ class ICapVideo(IBaseCap): SEARCH_VIEWS, SEARCH_DATE) = range(4) - def iter_search_results(self, pattern=None, sortby=SEARCH_RELEVANCE, nsfw=False, max_results=None): + def search_videos(self, pattern=None, sortby=SEARCH_RELEVANCE, nsfw=False, max_results=None): """ Iter results of a search on a pattern. Note that if pattern is None, it get the latest videos.