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

[pixiv] handle timestamps at the end of urls

Browse Source
This commit is contained in:
Mike Fährmann 2015-06-28 12:36:30 +02:00
parent 13ebca2a48
commit 63992363a6
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gallery_dl/extractor/pixiv.py
View File

@ -12,7 +12,6 @@ from .common import SequentialExtractor
from .common import Message from .common import Message
import re import re
import json import json
import requests
info = { info = {
"category": "pixiv", "category": "pixiv",
@ -51,6 +50,13 @@ class PixivExtractor(SequentialExtractor):
for work in self.get_works(): for work in self.get_works():
work.update(metadata) work.update(metadata)
pos = work["extension"].rfind("?", -18)
if pos != -1:
timestamp = work["extension"][pos:]
work["extension"] = work["extension"][:pos]
else:
timestamp = ""
if work["type"] == "ugoira": if work["type"] == "ugoira":
url, framelist = self.parse_ugoira(work) url, framelist = self.parse_ugoira(work)
work["extension"] = "zip" work["extension"] = "zip"
@ -64,17 +70,16 @@ class PixivExtractor(SequentialExtractor):
else: else:
url = work["url"] url = work["url"]
ext = work["extension"] ext = work["extension"]
off = url.rfind(".")
if url[off-2] == "p":
off -= 3
if work["id"] > 11319935 and "/img-original/" not in url: if work["id"] > 11319935 and "/img-original/" not in url:
big = "_big" big = "_big"
else: else:
big = "" big = ""
if url[-6] == "p":
part = url[:-7]
else:
part = url[:-4]
for i in range(work["page_count"]): for i in range(work["page_count"]):
work["num"] = "_p{:02}".format(i) work["num"] = "_p{:02}".format(i)
url = "{}{}_p{}.{}".format(part, big, i, ext) url = "{}{}_p{}.{}{}".format(url[:off], big, i, ext, timestamp)
yield Message.Url, url, work.copy() yield Message.Url, url, work.copy()
def get_works(self): def get_works(self):
@ -137,8 +142,8 @@ class PixivAPI():
- http://blog.imaou.com/opensource/2014/10/09/pixiv_api_for_ios_update.html - http://blog.imaou.com/opensource/2014/10/09/pixiv_api_for_ios_update.html
""" """
def __init__(self, session=None): def __init__(self, session):
self.session = session or requests.Session() self.session = session
self.session.headers.update({ self.session.headers.update({
"Referer": "http://www.pixiv.net/", "Referer": "http://www.pixiv.net/",
"User-Agent": "PixivIOSApp/5.1.1", "User-Agent": "PixivIOSApp/5.1.1",