Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-25 04:02:32 +01:00
Code Issues Releases Wiki Activity

[koharu] updat root and root_api change

Browse Source
This commit is contained in:
K0ng2 2024-11-07 07:14:01 +00:00 committed by Mike Fährmann
parent c82f3db098
commit a09d9edaa6
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gallery_dl/extractor/koharu.py
View File

@ -12,14 +12,14 @@ from .common import GalleryExtractor, Extractor, Message
from .. import text, exception from .. import text, exception
from ..cache import cache from ..cache import cache
BASE_PATTERN = r"(?i)(?:https?://)?(?:koharu|anchira)\.to" BASE_PATTERN = r"(?i)(?:https?://)?((?:anchira|seia)\.to|(?:niyaniya|shupogaki)\.moe|hoshino\.one)"
class KoharuExtractor(Extractor): class KoharuExtractor(Extractor):
"""Base class for koharu extractors""" """Base class for koharu extractors"""
category = "koharu" category = "koharu"
root = "https://koharu.to" root = "https://niyaniya.moe"
root_api = "https://api.koharu.to" root_api = "https://api.schale.network"
request_interval = (0.5, 1.5) request_interval = (0.5, 1.5)
def _init(self): def _init(self):
@ -62,7 +62,7 @@ class KoharuGalleryExtractor(KoharuExtractor, GalleryExtractor):
archive_fmt = "{id}_{num}" archive_fmt = "{id}_{num}"
request_interval = 0.0 request_interval = 0.0
pattern = BASE_PATTERN + r"/(?:g|reader)/(\d+)/(\w+)" pattern = BASE_PATTERN + r"/(?:g|reader)/(\d+)/(\w+)"
example = "https://koharu.to/g/12345/67890abcde/" example = "https://niyaniya.moe/g/12345/67890abcde/"
TAG_TYPES = { TAG_TYPES = {
0 : "general", 0 : "general",
@ -100,7 +100,7 @@ class KoharuGalleryExtractor(KoharuExtractor, GalleryExtractor):
def metadata(self, _): def metadata(self, _):
url = "{}/books/detail/{}/{}".format( url = "{}/books/detail/{}/{}".format(
self.root_api, self.groups[0], self.groups[1]) self.root_api, self.groups[1], self.groups[2])
self.data = data = self.request(url, headers=self.headers).json() self.data = data = self.request(url, headers=self.headers).json()
tags = [] tags = []
@ -192,7 +192,7 @@ class KoharuSearchExtractor(KoharuExtractor):
"""Extractor for koharu search results""" """Extractor for koharu search results"""
subcategory = "search" subcategory = "search"
pattern = BASE_PATTERN + r"/\?([^#]*)" pattern = BASE_PATTERN + r"/\?([^#]*)"
example = "https://koharu.to/?s=QUERY" example = "https://niyaniya.moe/?s=QUERY"
def items(self): def items(self):
params = text.parse_query(self.groups[0]) params = text.parse_query(self.groups[0])
@ -204,7 +204,7 @@ class KoharuFavoriteExtractor(KoharuExtractor):
"""Extractor for koharu favorites""" """Extractor for koharu favorites"""
subcategory = "favorite" subcategory = "favorite"
pattern = BASE_PATTERN + r"/favorites(?:\?([^#]*))?" pattern = BASE_PATTERN + r"/favorites(?:\?([^#]*))?"
example = "https://koharu.to/favorites" example = "https://niyaniya.moe/favorites"
def items(self): def items(self):
self.login() self.login()
@ -226,7 +226,7 @@ class KoharuFavoriteExtractor(KoharuExtractor):
def _login_impl(self, username, password): def _login_impl(self, username, password):
self.log.info("Logging in as %s", username) self.log.info("Logging in as %s", username)
url = "https://auth.koharu.to/login" url = "https://auth.schale.network/login"
data = {"uname": username, "passwd": password} data = {"uname": username, "passwd": password}
response = self.request( response = self.request(
url, method="POST", headers=self.headers, data=data) url, method="POST", headers=self.headers, data=data)

18
test/results/koharu.py
View File

@ -9,7 +9,7 @@ from gallery_dl.extractor import koharu
__tests__ = ( __tests__ = (
{ {
"#url" : "https://koharu.to/g/14216/6c67076fdd45", "#url" : "https://niyaniya.moe/g/14216/6c67076fdd45",
"#category": ("", "koharu", "gallery"), "#category": ("", "koharu", "gallery"),
"#class" : koharu.KoharuGalleryExtractor, "#class" : koharu.KoharuGalleryExtractor,
"#pattern" : r"https://kisakisexo.xyz/download/59896/a4fbd1828229/f47639c6abaf1903dd69c36a3d961da84741a1831aa07a2906ce9c74156a5d75\?v=1721626410802&w=0", "#pattern" : r"https://kisakisexo.xyz/download/59896/a4fbd1828229/f47639c6abaf1903dd69c36a3d961da84741a1831aa07a2906ce9c74156a5d75\?v=1721626410802&w=0",
@ -48,7 +48,7 @@ __tests__ = (
}, },
{ {
"#url" : "https://koharu.to/g/14216/6c67076fdd45", "#url" : "https://niyaniya.moe/g/14216/6c67076fdd45",
"#category": ("", "koharu", "gallery"), "#category": ("", "koharu", "gallery"),
"#class" : koharu.KoharuGalleryExtractor, "#class" : koharu.KoharuGalleryExtractor,
"#options" : {"cbz": False, "format": "780"}, "#options" : {"cbz": False, "format": "780"},
@ -57,7 +57,7 @@ __tests__ = (
}, },
{ {
"#url" : "https://koharu.to/g/14216/6c67076fdd45", "#url" : "https://niyaniya.moe/g/14216/6c67076fdd45",
"#category": ("", "koharu", "gallery"), "#category": ("", "koharu", "gallery"),
"#class" : koharu.KoharuGalleryExtractor, "#class" : koharu.KoharuGalleryExtractor,
"#options" : {"cbz": False, "format": "780"}, "#options" : {"cbz": False, "format": "780"},
@ -72,13 +72,13 @@ __tests__ = (
}, },
{ {
"#url" : "https://koharu.to/reader/14216/6c67076fdd45", "#url" : "https://niyaniya.moe/reader/14216/6c67076fdd45",
"#category": ("", "koharu", "gallery"), "#category": ("", "koharu", "gallery"),
"#class" : koharu.KoharuGalleryExtractor, "#class" : koharu.KoharuGalleryExtractor,
}, },
{ {
"#url" : "https://koharu.to/?s=tag:^beach$", "#url" : "https://niyaniya.moe/?s=tag:^beach$",
"#category": ("", "koharu", "search"), "#category": ("", "koharu", "search"),
"#class" : koharu.KoharuSearchExtractor, "#class" : koharu.KoharuSearchExtractor,
"#pattern" : koharu.KoharuGalleryExtractor.pattern, "#pattern" : koharu.KoharuGalleryExtractor.pattern,
@ -86,24 +86,24 @@ __tests__ = (
}, },
{ {
"#url" : "https://koharu.to/favorites", "#url" : "https://niyaniya.moe/favorites",
"#category": ("", "koharu", "favorite"), "#category": ("", "koharu", "favorite"),
"#class" : koharu.KoharuFavoriteExtractor, "#class" : koharu.KoharuFavoriteExtractor,
"#pattern" : koharu.KoharuGalleryExtractor.pattern, "#pattern" : koharu.KoharuGalleryExtractor.pattern,
"#auth" : True, "#auth" : True,
"#urls" : [ "#urls" : [
"https://koharu.to/g/14216/6c67076fdd45", "https://niyaniya.moe/g/14216/6c67076fdd45",
], ],
}, },
{ {
"#url" : "https://koharu.to/favorites?cat=6&sort=4", "#url" : "https://niyaniya.moe/favorites?cat=6&sort=4",
"#category": ("", "koharu", "favorite"), "#category": ("", "koharu", "favorite"),
"#class" : koharu.KoharuFavoriteExtractor, "#class" : koharu.KoharuFavoriteExtractor,
"#pattern" : koharu.KoharuGalleryExtractor.pattern, "#pattern" : koharu.KoharuGalleryExtractor.pattern,
"#auth" : True, "#auth" : True,
"#urls" : [ "#urls" : [
"https://koharu.to/g/14216/6c67076fdd45", "https://niyaniya.moe/g/14216/6c67076fdd45",
], ],
}, },