diff --git a/gallery_dl/extractor/imgchili.py b/gallery_dl/extractor/imgchili.py index afb9c0da..40932912 100644 --- a/gallery_dl/extractor/imgchili.py +++ b/gallery_dl/extractor/imgchili.py @@ -1,24 +1,65 @@ -from .common import BasicExtractor -from ..util import filename_from_url +# -*- coding: utf-8 -*- + +# Copyright 2014, 2015 Mike Fährmann +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. + +"""Extract images from albums at http://imgchili.net/""" + +from .common import SequentialExtractor +from .common import Message +from .common import filename_from_url import re -class Extractor(BasicExtractor): +info = { + "category": "imgchili", + "extractor": "ImgchiliExtractor", + "directory": ["{category}", "{title} - {key}"], + "filename": "{num:>03}-{name}", + "pattern": [ + r"(?:https?://)?(?:www\.)?imgchili\.net/album/([^/]+)", + ], +} + +class ImgchiliExtractor(SequentialExtractor): def __init__(self, match, config): - BasicExtractor.__init__(self, config) - self.url = match.group(0) - self.page = self.request(self.url).text; - self.category = "imgchili" - - title = self.get_title() - pos = self.url.rindex("/") - self.directory = title + " - " + self.url[pos+1:] - - def images(self): - pattern = r' src="http://t(\d+\.imgchili.net/[^"]+)"' - for match in re.finditer(pattern, self.page): - url = "http://i" + match.group(1) - yield url, filename_from_url(url) - - def get_title(self): - return self.extract(self.page, "