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

[seiga] use HTTPS

Browse Source
This commit is contained in:
Mike Fährmann
2019-02-21 22:51:11 +01:00
parent ea6fbfdd39
commit 3159dd79d5
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/supportedsites.rst
View File

@@ -59,7 +59,7 @@ Mangareader https://www.mangareader.net/ Chapters, Manga
Newgrounds https://www.newgrounds.com/ Images from Users, individual Images, Videos Newgrounds https://www.newgrounds.com/ Images from Users, individual Images, Videos
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 http://seiga.nicovideo.jp/ Images from Users, individual Images Required Niconico Seiga https://seiga.nicovideo.jp/ Images from Users, individual Images Required
nijie https://nijie.info/ |nijie-C| Required nijie https://nijie.info/ |nijie-C| Required
Nyafuu Archive https://archive.nyafuu.org/ Threads Nyafuu Archive https://archive.nyafuu.org/ Threads
Pawoo https://pawoo.net/ Images from Users, Images from Statuses Pawoo https://pawoo.net/ Images from Users, Images from Statuses

19
gallery_dl/extractor/seiga.py
View File

@@ -6,7 +6,7 @@
# it under the terms of the GNU General Public License version 2 as # it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation. # published by the Free Software Foundation.
"""Extract images from http://seiga.nicovideo.jp/""" """Extract images from https://seiga.nicovideo.jp/"""
from .common import Extractor, Message from .common import Extractor, Message
from .. import text, util, exception from .. import text, util, exception
@@ -18,6 +18,7 @@ class SeigaExtractor(Extractor):
category = "seiga" category = "seiga"
archive_fmt = "{image_id}" archive_fmt = "{image_id}"
cookiedomain = ".nicovideo.jp" cookiedomain = ".nicovideo.jp"
root = "https://seiga.nicovideo.jp"
def __init__(self, match): def __init__(self, match):
Extractor.__init__(self, match) Extractor.__init__(self, match)
@@ -40,7 +41,7 @@ class SeigaExtractor(Extractor):
def get_image_url(self, image_id): def get_image_url(self, image_id):
"""Get url for an image with id 'image_id'""" """Get url for an image with id 'image_id'"""
url = "http://seiga.nicovideo.jp/image/source/{}".format(image_id) url = "{}/image/source/{}".format(self.root, image_id)
response = self.request( response = self.request(
url, method="HEAD", allow_redirects=False, expect=(404,)) url, method="HEAD", allow_redirects=False, expect=(404,))
if response.status_code == 404: if response.status_code == 404:
@@ -74,7 +75,7 @@ class SeigaUserExtractor(SeigaExtractor):
pattern = (r"(?:https?://)?(?:www\.|seiga\.)?nicovideo\.jp/" pattern = (r"(?:https?://)?(?:www\.|seiga\.)?nicovideo\.jp/"
r"user/illust/(\d+)(?:\?(?:[^&]+&)*sort=([^&#]+))?") r"user/illust/(\d+)(?:\?(?:[^&]+&)*sort=([^&#]+))?")
test = ( test = (
("http://seiga.nicovideo.jp/user/illust/39537793", { ("https://seiga.nicovideo.jp/user/illust/39537793", {
"pattern": r"https://lohas\.nicoseiga\.jp/priv/[0-9a-f]+/\d+/\d+", "pattern": r"https://lohas\.nicoseiga\.jp/priv/[0-9a-f]+/\d+/\d+",
"count": ">= 4", "count": ">= 4",
"keyword": { "keyword": {
@@ -92,10 +93,10 @@ class SeigaUserExtractor(SeigaExtractor):
"views": int, "views": int,
}, },
}), }),
("http://seiga.nicovideo.jp/user/illust/79433", { ("https://seiga.nicovideo.jp/user/illust/79433", {
"exception": exception.NotFoundError, "exception": exception.NotFoundError,
}), }),
("http://seiga.nicovideo.jp/user/illust/39537793" ("https://seiga.nicovideo.jp/user/illust/39537793"
"?sort=image_view&target=illust_all"), "?sort=image_view&target=illust_all"),
) )
@@ -132,7 +133,7 @@ class SeigaUserExtractor(SeigaExtractor):
} }
def get_images(self): def get_images(self):
url = "http://seiga.nicovideo.jp/user/illust/" + self.user_id url = "{}/user/illust/{}".format(self.root, self.user_id)
params = {"sort": self.order, "page": self.start_page, params = {"sort": self.order, "page": self.start_page,
"target": "illust_all"} "target": "illust_all"}
@@ -170,14 +171,14 @@ class SeigaImageExtractor(SeigaExtractor):
r"(?:seiga\.|www\.)?nicovideo\.jp/(?:seiga/im|image/source/)" r"(?:seiga\.|www\.)?nicovideo\.jp/(?:seiga/im|image/source/)"
r"|lohas\.nicoseiga\.jp/(?:thumb|(?:priv|o)/[^/]+/\d+)/)(\d+)") r"|lohas\.nicoseiga\.jp/(?:thumb|(?:priv|o)/[^/]+/\d+)/)(\d+)")
test = ( test = (
("http://seiga.nicovideo.jp/seiga/im5977527", { ("https://seiga.nicovideo.jp/seiga/im5977527", {
"keyword": "f66ba5de33d4ce2cb57f23bb37e1e847e0771c10", "keyword": "f66ba5de33d4ce2cb57f23bb37e1e847e0771c10",
"content": "d9202292012178374d57fb0126f6124387265297", "content": "d9202292012178374d57fb0126f6124387265297",
}), }),
("http://seiga.nicovideo.jp/seiga/im123", { ("https://seiga.nicovideo.jp/seiga/im123", {
"exception": exception.NotFoundError, "exception": exception.NotFoundError,
}), }),
("http://seiga.nicovideo.jp/image/source/5977527"), ("https://seiga.nicovideo.jp/image/source/5977527"),
("https://lohas.nicoseiga.jp/thumb/5977527i"), ("https://lohas.nicoseiga.jp/thumb/5977527i"),
("https://lohas.nicoseiga.jp/priv" ("https://lohas.nicoseiga.jp/priv"
"/759a4ef1c639106ba4d665ee6333832e647d0e4e/1549727594/5977527"), "/759a4ef1c639106ba4d665ee6333832e647d0e4e/1549727594/5977527"),