diff --git a/gallery_dl/extractor/imagebam.py b/gallery_dl/extractor/imagebam.py index 2ab8245a..7cd67d6a 100644 --- a/gallery_dl/extractor/imagebam.py +++ b/gallery_dl/extractor/imagebam.py @@ -10,6 +10,7 @@ from .common import Extractor, Message from .. import text, exception +import re class ImagebamExtractor(Extractor): @@ -19,25 +20,30 @@ class ImagebamExtractor(Extractor): def __init__(self, match): Extractor.__init__(self, match) - self.key = match.group(1) + self.path = match.group(1) self.session.cookies.set("nsfw_inter", "1", domain="www.imagebam.com") - def get_image_data(self, data): - page_url = "{}/image/{}".format(self.root, data["image_key"]) - page = self.request(page_url).text - image_url, pos = text.extract(page, '', '<')[0] - return {"title": text.unescape(title.strip())} + def metadata(page): + return {"title": text.unescape(text.extract( + page, 'id="gallery-name">', '<')[0].strip())} - def get_image_keys(self, page): - """Return a list of all image keys""" - keys = [] + def images(self, page): + findall = re.compile(r'