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

[newgrounds] implement login support (#394)

This commit is contained in:
Mike Fährmann 2019-11-15 23:54:07 +01:00
parent 3a07c06865
commit 3ece3976ae
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
4 changed files with 45 additions and 7 deletions

View File

@ -75,7 +75,7 @@ MangaPark https://mangapark.me/ Chapters, Manga
Mangareader https://www.mangareader.net/ Chapters, Manga Mangareader https://www.mangareader.net/ Chapters, Manga
Mangoxo https://www.mangoxo.com/ Albums, Channels Optional Mangoxo https://www.mangoxo.com/ Albums, Channels Optional
Naver https://blog.naver.com/ Blogs, Posts Naver https://blog.naver.com/ Blogs, Posts
Newgrounds https://www.newgrounds.com/ individual Images, User Profiles, Videos Newgrounds https://www.newgrounds.com/ individual Images, User Profiles, Videos Optional
Ngomik http://ngomik.in/ Chapters Ngomik http://ngomik.in/ Chapters
nhentai https://nhentai.net/ Galleries, Search Results nhentai https://nhentai.net/ Galleries, Search Results
Niconico Seiga https://seiga.nicovideo.jp/ individual Images, User Profiles Required Niconico Seiga https://seiga.nicovideo.jp/ individual Images, User Profiles Required

View File

@ -9,7 +9,8 @@
"""Extractors for https://www.newgrounds.com/""" """Extractors for https://www.newgrounds.com/"""
from .common import Extractor, Message from .common import Extractor, Message
from .. import text from .. import text, exception
from ..cache import cache
import json import json
@ -19,13 +20,17 @@ class NewgroundsExtractor(Extractor):
directory_fmt = ("{category}", "{user}") directory_fmt = ("{category}", "{user}")
filename_fmt = "{category}_{index}_{title}.{extension}" filename_fmt = "{category}_{index}_{title}.{extension}"
archive_fmt = "{index}" archive_fmt = "{index}"
root = "https://www.newgrounds.com"
cookiedomain = ".newgrounds.com"
cookienames = ("NG_GG_username", "vmk1du5I8m")
def __init__(self, match): def __init__(self, match):
Extractor.__init__(self, match) Extractor.__init__(self, match)
self.user = match.group(1) self.user = match.group(1)
self.root = "https://{}.newgrounds.com".format(self.user) self.user_root = "https://{}.newgrounds.com".format(self.user)
def items(self): def items(self):
self.login()
data = self.metadata() data = self.metadata()
yield Message.Version, 1 yield Message.Version, 1
@ -66,6 +71,37 @@ class NewgroundsExtractor(Extractor):
data["url"].rpartition("/")[2].partition("_")[0]) data["url"].rpartition("/")[2].partition("_")[0])
return data return data
def login(self):
username, password = self._get_auth_info()
if username:
self._update_cookies(self._login_impl(username, password))
@cache(maxage=360*24*3600, keyarg=1)
def _login_impl(self, username, password):
self.log.info("Logging in as %s", username)
url = self.root + "/passport/"
page = self.request(url).text
headers = {"Origin": self.root, "Referer": url}
url = text.urljoin(self.root, text.extract(page, 'action="', '"')[0])
data = {
"username": username,
"password": password,
"remember": "1",
"login" : "1",
}
response = self.request(url, method="POST", headers=headers, data=data)
if not response.history:
raise exception.AuthenticationError()
return {
cookie.name: cookie.value
for cookie in response.history[0].cookies
if cookie.expires and cookie.domain == self.cookiedomain
}
def _pagination(self, url): def _pagination(self, url):
headers = { headers = {
"Referer": self.root, "Referer": self.root,

View File

@ -119,6 +119,7 @@ AUTH_MAP = {
"imgbb" : "Optional", "imgbb" : "Optional",
"instagram" : "Optional", "instagram" : "Optional",
"mangoxo" : "Optional", "mangoxo" : "Optional",
"newgrounds" : "Optional",
"nijie" : "Required", "nijie" : "Required",
"pixiv" : "Required", "pixiv" : "Required",
"reddit" : "Optional (OAuth)", "reddit" : "Optional (OAuth)",

View File

@ -295,8 +295,9 @@ def setup_test_config():
config.set(("extractor", "seiga" , "username"), email) config.set(("extractor", "seiga" , "username"), email)
config.set(("extractor", "danbooru" , "username"), None) config.set(("extractor", "danbooru" , "username"), None)
config.set(("extractor", "instagram", "username"), None) config.set(("extractor", "instagram" , "username"), None)
config.set(("extractor", "imgur" , "username"), None) config.set(("extractor", "imgur" , "username"), None)
config.set(("extractor", "newgrounds", "username"), None)
config.set(("extractor", "twitter" , "username"), None) config.set(("extractor", "twitter" , "username"), None)
config.set(("extractor", "mangoxo" , "username"), "LiQiang3") config.set(("extractor", "mangoxo" , "username"), "LiQiang3")