github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[pixiv] fix ugoira extraction (closes #78)

Browse Source
This commit is contained in:
Mike Fährmann
2018-02-19 08:51:09 +01:00
parent 731ffd4986
commit b79f1f2ca7
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gallery_dl/extractor/pixiv.py
View File

@@ -19,7 +19,7 @@ class PixivExtractor(Extractor):
category = "pixiv" category = "pixiv"
directory_fmt = ["{category}", "{user[id]} {user[account]}"] directory_fmt = ["{category}", "{user[id]} {user[account]}"]
filename_fmt = "{category}_{user[id]}_{id}{num}.{extension}" filename_fmt = "{category}_{user[id]}_{id}{num}.{extension}"
archive_fmt = "{id}{num}" archive_fmt = "{id}{num}.{extension}"
illust_url = "https://www.pixiv.net/member_illust.php?mode=medium" illust_url = "https://www.pixiv.net/member_illust.php?mode=medium"
def __init__(self): def __init__(self):
@@ -75,7 +75,8 @@ class PixivExtractor(Extractor):
).text ).text
# parse page # parse page
frames = text.extract(page, ',"frames":[', ']')[0] meta = text.extract(page, ' data-meta="', '"')[0]
frames = text.extract(text.unescape(meta), ',"frames":[', ']')[0]
# build url # build url
url = re.sub( url = re.sub(
@@ -192,6 +193,13 @@ class PixivWorkExtractor(PixivExtractor):
"img/2017/04/25/07/33/29/62568267_p0.png"), { "img/2017/04/25/07/33/29/62568267_p0.png"), {
"url": "71b8bbd070d6b03a75ca4afb89f64d1445b2278d", "url": "71b8bbd070d6b03a75ca4afb89f64d1445b2278d",
}), }),
# ugoira
(("https://www.pixiv.net/member_illust.php"
"?mode=medium&illust_id=66806629"), {
"pattern": (r"https?://i\.pximg\.net/img-zip-ugoira/.*/"
r"66806629_ugoira1920x1080\.zip|text:.+"),
"count": 2,
}),
("https://www.pixiv.net/i/966412", None), ("https://www.pixiv.net/i/966412", None),
("http://img.pixiv.net/img/soundcross/42626136.jpg", None), ("http://img.pixiv.net/img/soundcross/42626136.jpg", None),
("http://i2.pixiv.net/img76/img/snailrin/42672235.jpg", None), ("http://i2.pixiv.net/img76/img/snailrin/42672235.jpg", None),