Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-22 02:32:33 +01:00
Code Issues Releases Wiki Activity

[imagetwist] adjust pattern and other fixes

Browse Source
This commit is contained in:
Mike Fährmann 2015-12-03 01:07:59 +01:00
parent 65c8566326
commit cb53b29391
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gallery_dl/extractor/imagetwist.py
View File

@ -15,24 +15,24 @@ class ImagetwistExtractor(Extractor):
category = "imagetwist"
directory_fmt = ["{category}"]
filename_fmt = "{category}_{index}_{filename}"
pattern = [r"(?:https?://)?(?:www\.)?imagetwist\.com/([^/]+)"]
filename_fmt = "{category}_{user}_{filename}"
pattern = [r"(?:https?://)?(?:www\.)?imagetwist\.com/([a-z0-9]{12})"]
def __init__(self, match):
Extractor.__init__(self)
self.token = match.group(1)
def items(self):
yield Message.Version, 1
page = self.request("http://imagetwist.com/" + self.token).text
url , pos = text.extract(page, '<img src="', '"')
filename, pos = text.extract(page, ' alt="', '"', pos)
index , pos = text.extract(url , '/', '/', 29)
userid , pos = text.extract(url , '/', '/', 29)
data = {
"category": self.category,
"token": self.token,
"index": index,
"user": userid,
}
text.nameext_from_url(filename, data)
yield Message.Version, 1
yield Message.Directory, data
yield Message.Url, url, data