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

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)

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']:

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:

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',))

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)

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()
 

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',))

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']:

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:

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',))

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']:

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:

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',))

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',))

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()

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',))

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']:

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:

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',))

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