1
0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-26 04:32:51 +01:00

[sankaku] small code improvements

This commit is contained in:
Mike Fährmann 2018-09-16 21:01:28 +02:00
parent 529aa21dd9
commit 2be4c9ffe3
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88

View File

@ -130,14 +130,15 @@ class SankakuExtractor(SharedConfigExtractor):
"""Actual login implementation"""
username = usertuple[0]
self.log.info("Logging in as %s", username)
url = self.root + "/user/authenticate"
data = {
"url": "",
"user[name]": username,
"user[password]": password,
"commit": "Login",
}
response = self.request(self.root + "/user/authenticate",
method="POST", data=data)
response = self.request(url, method="POST", data=data)
if not response.history or response.url != self.root + "/user/home":
raise exception.AuthenticationError()
cookies = response.history[0].cookies
@ -225,12 +226,10 @@ class SankakuTagExtractor(SankakuExtractor):
return
yield from ids
next_url = text.extract(page, 'next-page-url="/?', '"', pos)[0]
if next_url:
params["next"] = text.parse_query(next_url)["next"]
else:
params["next"] = text.parse_int(ids[-1]) - 1
params["page"] = 2
next_qs = text.extract(page, 'next-page-url="/?', '"', pos)[0]
next_id = text.parse_query(next_qs).get("next")
params["next"] = next_id or (text.parse_int(ids[-1]) - 1)
params["page"] = "2"
class SankakuPoolExtractor(SankakuExtractor):