From 156903751adea9cd1d321468f191dfeaca62247f Mon Sep 17 00:00:00 2001 From: Roger Philibert Date: Fri, 9 Sep 2011 02:06:09 +0200 Subject: [PATCH] Enables matching an URL in E-Hentai --- weboob/backends/ehentai/backend.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/weboob/backends/ehentai/backend.py b/weboob/backends/ehentai/backend.py index a1a1270a..c44ab375 100644 --- a/weboob/backends/ehentai/backend.py +++ b/weboob/backends/ehentai/backend.py @@ -62,10 +62,19 @@ class EHentaiBackend(BaseBackend, ICapGallery): with self.browser: return self.browser.iter_gallery_images(gallery) + ID_REGEXP = r'/?\d+/[\dabcdef]+/?' + URL_REGEXP = r'.+/g/(%s)' % ID_REGEXP def get_gallery(self, _id): - if not re.match(r'(?i)/?\d+/[\dabcdef]+/?', _id): - return None - + match = re.match(r'^%s$' % self.URL_REGEXP, _id) + if match: + _id = match.group(1) + else: + match = re.match(r'^%s$' % self.ID_REGEXP, _id) + if match: + _id = match.group(0) + else: + return None + gallery = EHentaiGallery(_id) with self.browser: if self.browser.gallery_exists(gallery):