diff --git a/weboob/backends/eatmanga/backend.py b/weboob/backends/eatmanga/backend.py index e1024dd1..114d0cb2 100644 --- a/weboob/backends/eatmanga/backend.py +++ b/weboob/backends/eatmanga/backend.py @@ -27,8 +27,7 @@ class EatmangaBackend(GenericComicReaderBackend): DOMAIN = 'www.eatmanga.com' BROWSER_PARAMS = dict( img_src_xpath="//img[@class='eatmanga_bigimage']/@src", - page_list_xpath="(//select[@id='pages'])[1]/option/@value", - page_to_location="http://%s%%s" % DOMAIN) + page_list_xpath="(//select[@id='pages'])[1]/option/@value") ID_REGEXP = r'[^/]+/[^/]+' URL_REGEXP = r'.+eatmanga.com/(?:index.php/)?Manga-Scan/(%s).+' % ID_REGEXP ID_TO_URL = 'http://www.eatmanga.com/index.php/Manga-Scan/%s' diff --git a/weboob/backends/mangahere/backend.py b/weboob/backends/mangahere/backend.py index 7dae750a..9d7e449f 100644 --- a/weboob/backends/mangahere/backend.py +++ b/weboob/backends/mangahere/backend.py @@ -27,8 +27,7 @@ class MangahereBackend(GenericComicReaderBackend): DOMAIN = 'www.mangahere.com' BROWSER_PARAMS = dict( img_src_xpath="//img[@id='image']/@src", - page_list_xpath="(//select[@onchange='change_page(this)'])[1]/option/@value", - page_to_location="%s") + page_list_xpath="(//select[@onchange='change_page(this)'])[1]/option/@value") ID_REGEXP = r'[^/]+/[^/]+/[^/]+' URL_REGEXP = r'.+mangahere.com/manga/(%s).+' % ID_REGEXP ID_TO_URL = 'http://www.mangahere.com/manga/%s' diff --git a/weboob/backends/mangareader/backend.py b/weboob/backends/mangareader/backend.py index 68d3fe01..1e02bcbf 100644 --- a/weboob/backends/mangareader/backend.py +++ b/weboob/backends/mangareader/backend.py @@ -27,8 +27,7 @@ class MangareaderBackend(GenericComicReaderBackend): DOMAIN = 'www.mangareader.net' BROWSER_PARAMS = dict( img_src_xpath="//img[@id='img']/@src", - page_list_xpath="//select[@id='pageMenu']/option/@value", - page_to_location="http://%s%%s" % DOMAIN) + page_list_xpath="//select[@id='pageMenu']/option/@value") ID_REGEXP = r'[^/]+/[^/]+' URL_REGEXP = r'.+mangareader.net/(%s).+' % ID_REGEXP ID_TO_URL = 'http://www.mangareader.net/%s' diff --git a/weboob/backends/mangatoshokan/backend.py b/weboob/backends/mangatoshokan/backend.py index 64a093de..6ad372c4 100644 --- a/weboob/backends/mangatoshokan/backend.py +++ b/weboob/backends/mangatoshokan/backend.py @@ -27,8 +27,7 @@ class MangatoshokanBackend(GenericComicReaderBackend): DOMAIN = "www.mangatoshokan.com" BROWSER_PARAMS = dict( img_src_xpath="//img[@id='readerPage']/@src", - page_list_xpath="(//select[@class='headerSelect'])[1]/option/@value", - page_to_location='http://%s%%s' % DOMAIN) + page_list_xpath="(//select[@class='headerSelect'])[1]/option/@value") ID_TO_URL = 'http://www.mangatoshokan.com/read/%s' ID_REGEXP = r'[^/]+(?:/[^/]+)*' URL_REGEXP = r'.+mangatoshokan.com/read/(%s)' % ID_REGEXP diff --git a/weboob/backends/simplyreadit/backend.py b/weboob/backends/simplyreadit/backend.py index 13d9538d..7ade6b5d 100644 --- a/weboob/backends/simplyreadit/backend.py +++ b/weboob/backends/simplyreadit/backend.py @@ -26,8 +26,7 @@ class SimplyreaditBackend(GenericComicReaderBackend): DESCRIPTION = 'Simplyreadit manga reading site' BROWSER_PARAMS = dict( img_src_xpath="//img[@class='open']/@src", - page_list_xpath="(//div[contains(@class,'dropdown_right')]/ul[@class='dropdown'])[1]/li/a/@href", - page_to_location="%s") + page_list_xpath="(//div[contains(@class,'dropdown_right')]/ul[@class='dropdown'])[1]/li/a/@href") ID_TO_URL = 'http://www.simplyread.it/reader/read/%s' ID_REGEXP = r'[^/]+(?:/[^/]+)*' URL_REGEXP = r'.+simplyread.it/reader/read/(%s)/page/.+' % ID_REGEXP diff --git a/weboob/tools/capabilities/gallery/genericcomicreader/backend.py b/weboob/tools/capabilities/gallery/genericcomicreader/backend.py index 58484894..69b422f2 100644 --- a/weboob/tools/capabilities/gallery/genericcomicreader/backend.py +++ b/weboob/tools/capabilities/gallery/genericcomicreader/backend.py @@ -49,7 +49,11 @@ class GenericComicReaderBrowser(BaseBrowser): assert self.is_on_page(DisplayPage) for p in self.page.page_list(): - self.location(self.params['page_to_location'] % p) + if 'page_to_location' in self.params: + self.location(self.params['page_to_location'] % p) + else: + self.location(p) + assert self.is_on_page(DisplayPage) yield self.page.get_page(gallery)