rename iter_search_results to either search_videos and search_gallery (closes #779)
This commit is contained in:
parent
46f94a1d78
commit
56691d7ea7
39 changed files with 52 additions and 52 deletions
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -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',))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue