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

[seiga] fix flake8 and cookie test (#1063)

Browse Source
This commit is contained in:
Mike Fährmann
2020-10-15 15:37:02 +02:00
parent d1c6d78477
commit 07432d6262
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gallery_dl/extractor/seiga.py
View File

@@ -48,7 +48,7 @@ class SeigaExtractor(Extractor):
def login(self): def login(self):
"""Login and set necessary cookies""" """Login and set necessary cookies"""
if not self._check_cookies(("user_session")): if not self._check_cookies(("user_session",)):
username, password = self._get_auth_info() username, password = self._get_auth_info()
self._update_cookies(self._login_impl(username, password)) self._update_cookies(self._login_impl(username, password))
@@ -197,23 +197,22 @@ class SeigaImageExtractor(SeigaExtractor):
def get_images(self): def get_images(self):
url = "{}/seiga/im{}".format(self.root, self.image_id) url = "{}/seiga/im{}".format(self.root, self.image_id)
page = self.request(url).text page = self.request(url, notfound="image").text
data = text.extract_all(page, ( data = text.extract_all(page, (
("date", '<li class="date"><span class="created">', '</span></li>'), ("date" , '<li class="date"><span class="created">', '<'),
("title", '<h1 class="title">', '</h1>'), ("title" , '<h1 class="title">', '</h1>'),
("description" , '<p class="discription">', '</p>'), ("description" , '<p class="discription">', '</p>'),
))[0] ))[0]
# Ugly,
data["user"] = text.extract_all(page, ( data["user"] = text.extract_all(page, (
("id", '<li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="/user/illust/', '" itemprop="url">'), ("id" , '<a href="/user/illust/' , '"'),
("name", '<span itemprop="title">', '<span class="pankuzu_suffix">'), ("name", '<span itemprop="title">', '<'),
))[0] ))[0]
data["description"] = text.remove_html(data["description"]) data["description"] = text.remove_html(data["description"])
data["date"] = text.parse_datetime(data["date"] + ":00+0900", "%Y年%m月%d日 %H:%M:%S%z")
data["image_id"] = text.parse_int(self.image_id) data["image_id"] = text.parse_int(self.image_id)
data["date"] = text.parse_datetime(
data["date"] + ":00+0900", "%Y年%m月%d日 %H:%M:%S%z")
# VERY VERY UGLY!!!
return (data, data) return (data, data)

2
test/test_cookies.py
View File

@@ -107,7 +107,7 @@ class TestCookieLogin(unittest.TestCase):
"exhentai": ("ipb_member_id", "ipb_pass_hash"), "exhentai": ("ipb_member_id", "ipb_pass_hash"),
"nijie" : ("nemail", "nlogin"), "nijie" : ("nemail", "nlogin"),
"sankaku" : ("login", "pass_hash"), "sankaku" : ("login", "pass_hash"),
"seiga" : ("user_session"), "seiga" : ("user_session",),
} }
for category, cookienames in extr_cookies.items(): for category, cookienames in extr_cookies.items():
cookies = {name: "value" for name in cookienames} cookies = {name: "value" for name in cookienames}