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

[nijie] proper login and other issues fixed

Browse Source
This commit is contained in:
Mike Fährmann
2015-12-11 00:07:21 +01:00
parent 2dfed4d40a
commit 75ff08f73c
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gallery-dl.conf
View File

@@ -27,12 +27,8 @@
}, },
"nijie": "nijie":
{ {
"cookies": "email": null,
{ "password": null
"NIJIEIJIEID": null,
"nijie_email_hash": null,
"nijie_login_hash": null
}
}, },
"gelbooru": "gelbooru":
{ {

32
gallery_dl/extractor/nijie.py
View File

@@ -10,10 +10,9 @@
from .common import AsynchronousExtractor, Message from .common import AsynchronousExtractor, Message
from .. import config, text from .. import config, text
import re
class NijieExtractor(AsynchronousExtractor):
class NijieUserExtractor(AsynchronousExtractor):
"""Extract all works of a single nijie-user"""
category = "nijie" category = "nijie"
directory_fmt = ["{category}", "{artist-id}"] directory_fmt = ["{category}", "{artist-id}"]
filename_fmt = "{category}_{artist-id}_{image-id}_p{index:>02}.{extension}" filename_fmt = "{category}_{artist-id}_{image-id}_p{index:>02}.{extension}"
@@ -28,13 +27,9 @@ class NijieExtractor(AsynchronousExtractor):
+ self.artist_id + self.artist_id
) )
self.session.headers["Referer"] = self.artist_url self.session.headers["Referer"] = self.artist_url
self.session.cookies["R18"] = "1"
self.session.cookies["nijie_referer"] = "nijie.info"
self.session.cookies.update(
config.get(("extractor", self.category, "cookies"))
)
def items(self): def items(self):
self.login()
data = self.get_job_metadata() data = self.get_job_metadata()
yield Message.Version, 1 yield Message.Version, 1
yield Message.Directory, data yield Message.Directory, data
@@ -53,16 +48,25 @@ class NijieExtractor(AsynchronousExtractor):
def get_image_ids(self): def get_image_ids(self):
"""Collect all image-ids for a specific artist""" """Collect all image-ids for a specific artist"""
page = self.request(self.artist_url).text page = self.request(self.artist_url).text
regex = r'<a href="/view\.php\?id=(\d+)"' return list(text.extract_iter(page, ' illust_id="', '"'))
return [m.group(1) for m in re.finditer(regex, page)]
def get_image_data(self, image_id): def get_image_data(self, image_id):
"""Get URL and metadata for images specified by 'image_id'""" """Get URL and metadata for images specified by 'image_id'"""
page = self.request(self.popup_url + image_id).text page = self.request(self.popup_url + image_id).text
matches = re.findall('<img src="([^"]+)"', page) images = list(text.extract_iter(page, '<img src="//pic', '"'))
for index, url in enumerate(matches): for index, url in enumerate(images):
yield "https:" + url, text.nameext_from_url(url, { yield "https://pic" + url, text.nameext_from_url(url, {
"count": len(matches), "count": len(images),
"index": index, "index": index,
"image-id": image_id, "image-id": image_id,
}) })
def login(self):
"""Login and obtain session cookie"""
params = {
"email": config.get(("extractor", self.category, "email")),
"password": config.get(("extractor", self.category, "password")),
}
page = self.session.post("https://nijie.info/login_int.php", data=params).text
if "//nijie.info/login.php" in page:
raise Exception("login failed")