From 689fe43ed599b1f052b8ea5e7477476bfc1b4f9d Mon Sep 17 00:00:00 2001 From: Alexandre Morignot Date: Fri, 5 Dec 2014 05:53:22 +0100 Subject: [PATCH] [CapGallery] correct method name The modules using this capability and galleroob have been corrected too --- modules/ehentai/browser.py | 2 +- modules/ehentai/module.py | 4 ++-- modules/ehentai/test.py | 2 +- weboob/applications/galleroob/galleroob.py | 2 +- weboob/capabilities/gallery.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/ehentai/browser.py b/modules/ehentai/browser.py index 4da0b18f..6ffa15c4 100644 --- a/modules/ehentai/browser.py +++ b/modules/ehentai/browser.py @@ -51,7 +51,7 @@ class EHentaiBrowser(Browser): def _gallery_page(self, gallery, n): return gallery.url + ('?p='+str(n)) - def search_gallery(self, pattern): + def search_galleries(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/module.py b/modules/ehentai/module.py index 102ae08f..7a034148 100644 --- a/modules/ehentai/module.py +++ b/modules/ehentai/module.py @@ -53,9 +53,9 @@ class EHentaiModule(Module, CapGallery, CapCollection): password = None return self.create_browser(self.config['domain'].get(), username, password) - def search_gallery(self, pattern, sortby=None): + def search_galleries(self, pattern, sortby=None): with self.browser: - return self.browser.search_gallery(pattern) + return self.browser.search_galleries(pattern) def iter_gallery_images(self, gallery): self.fillobj(gallery, ('url',)) diff --git a/modules/ehentai/test.py b/modules/ehentai/test.py index cd3e43aa..f6c30721 100644 --- a/modules/ehentai/test.py +++ b/modules/ehentai/test.py @@ -26,7 +26,7 @@ class EHentaiTest(BackendTest): MODULE = 'ehentai' def test_search(self): - l = list(self.backend.search_gallery('lol')) + l = list(self.backend.search_galleries('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 57707b89..752b9ad7 100644 --- a/weboob/applications/galleroob/galleroob.py +++ b/weboob/applications/galleroob/galleroob.py @@ -71,7 +71,7 @@ class Galleroob(ReplApplication): return 2 self.start_format(pattern=pattern) - for gallery in self.do('search_gallery', pattern=pattern): + for gallery in self.do('search_galleries', pattern=pattern): self.cached_format(gallery) def do_download(self, line): diff --git a/weboob/capabilities/gallery.py b/weboob/capabilities/gallery.py index 634b0a53..4f8663c3 100644 --- a/weboob/capabilities/gallery.py +++ b/weboob/capabilities/gallery.py @@ -113,7 +113,7 @@ class CapGallery(Capability): SEARCH_VIEWS, SEARCH_DATE) = range(4) - def search_gallery(self, pattern, sortby=SEARCH_RELEVANCE): + def search_galleries(self, pattern, sortby=SEARCH_RELEVANCE): """ Iter results of a search on a pattern.