From b5e141ed6e6719164c40117a7f091e7a9dd1f38c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Fri, 26 Jul 2024 17:39:27 +0200 Subject: [PATCH] [sankakucomplex] update domain to 'news.sankakucomplex.com' --- docs/supportedsites.md | 2 +- gallery_dl/extractor/sankakucomplex.py | 14 +++++++------- test/results/sankakucomplex.py | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/supportedsites.md b/docs/supportedsites.md index 21c2390b..241b1126 100644 --- a/docs/supportedsites.md +++ b/docs/supportedsites.md @@ -765,7 +765,7 @@ Consider all listed sites to potentially be NSFW. Sankaku Complex - https://www.sankakucomplex.com/ + https://news.sankakucomplex.com/ Articles, Tag Searches diff --git a/gallery_dl/extractor/sankakucomplex.py b/gallery_dl/extractor/sankakucomplex.py index e1d4153a..50c21e35 100644 --- a/gallery_dl/extractor/sankakucomplex.py +++ b/gallery_dl/extractor/sankakucomplex.py @@ -6,7 +6,7 @@ # it under the terms of the GNU General Public License version 2 as # published by the Free Software Foundation. -"""Extractors for https://www.sankakucomplex.com/""" +"""Extractors for https://news.sankakucomplex.com/""" from .common import Extractor, Message from .. import text, util @@ -16,7 +16,7 @@ import re class SankakucomplexExtractor(Extractor): """Base class for sankakucomplex extractors""" category = "sankakucomplex" - root = "https://www.sankakucomplex.com" + root = "https://news.sankakucomplex.com" def __init__(self, match): Extractor.__init__(self, match) @@ -24,14 +24,14 @@ class SankakucomplexExtractor(Extractor): class SankakucomplexArticleExtractor(SankakucomplexExtractor): - """Extractor for articles on www.sankakucomplex.com""" + """Extractor for articles on news.sankakucomplex.com""" subcategory = "article" directory_fmt = ("{category}", "{date:%Y-%m-%d} {title}") filename_fmt = "{filename}.{extension}" archive_fmt = "{date:%Y%m%d}_{filename}" - pattern = (r"(?:https?://)?www\.sankakucomplex\.com" + pattern = (r"(?:https?://)?(?:news|www)\.sankakucomplex\.com" r"/(\d\d\d\d/\d\d/\d\d/[^/?#]+)") - example = "https://www.sankakucomplex.com/1970/01/01/TITLE" + example = "https://news.sankakucomplex.com/1970/01/01/TITLE" def items(self): url = "{}/{}/?pg=X".format(self.root, self.path) @@ -87,9 +87,9 @@ class SankakucomplexArticleExtractor(SankakucomplexExtractor): class SankakucomplexTagExtractor(SankakucomplexExtractor): """Extractor for sankakucomplex blog articles by tag or author""" subcategory = "tag" - pattern = (r"(?:https?://)?www\.sankakucomplex\.com" + pattern = (r"(?:https?://)?(?:news|www)\.sankakucomplex\.com" r"/((?:tag|category|author)/[^/?#]+)") - example = "https://www.sankakucomplex.com/tag/TAG/" + example = "https://news.sankakucomplex.com/tag/TAG/" def items(self): pnum = 1 diff --git a/test/results/sankakucomplex.py b/test/results/sankakucomplex.py index f944df16..bcf44d95 100644 --- a/test/results/sankakucomplex.py +++ b/test/results/sankakucomplex.py @@ -9,19 +9,19 @@ from gallery_dl.extractor import sankakucomplex __tests__ = ( { - "#url" : "https://www.sankakucomplex.com/2019/05/11/twitter-cosplayers", + "#url" : "https://news.sankakucomplex.com/2019/05/11/twitter-cosplayers", "#category": ("", "sankakucomplex", "article"), "#class" : sankakucomplex.SankakucomplexArticleExtractor, - "#sha1_url" : "4a9ecc5ae917fbce469280da5b6a482510cae84d", - "#sha1_metadata": "bfe08310e7d9a572f568f6900e0ed0eb295aa2b3", + "#pattern" : r"https://news\.sankakucomplex\.com/wp-content/uploads/2019/05/maid-day-cosplay-\d+\.jpg", + "#sha1_metadata": "21bf106150913a1398860031f06d6e1e6423e518", }, { "#url" : "https://www.sankakucomplex.com/2009/12/01/sexy-goddesses-of-2ch", "#category": ("", "sankakucomplex", "article"), "#class" : sankakucomplex.SankakucomplexArticleExtractor, - "#sha1_url" : "a1e249173fd6c899a8134fcfbd9c925588a63f7c", - "#sha1_metadata": "e78fcc23c2711befc0969a45ea5082a29efccf68", + "#pattern" : r"https://news\.sankakucomplex\.com/wp-content/uploads/2009/12/Goddesses-of-2ch-amateur-internet-idol-\d+\.jpe?g", + "#sha1_metadata": "651e4ee79ecab1771b43df467b5ab32249d69b2a", }, {