diff --git a/docs/supportedsites.rst b/docs/supportedsites.rst index 613d5b54..87b67331 100644 --- a/docs/supportedsites.rst +++ b/docs/supportedsites.rst @@ -11,7 +11,7 @@ Site URL Capabilities 4plebs https://archive.4plebs.org/ Threads 500px https://500px.com/ Galleries, individual Images, User Profiles 8kun https://8kun.top/ Boards, Threads -8muses https://www.8muses.com/ Albums +8muses https://comics.8muses.com/ Albums Adobe Portfolio https://www.myportfolio.com/ Galleries Adult Empire https://www.adultempire.com/ Galleries arch.b4k.co https://arch.b4k.co/ Threads diff --git a/gallery_dl/extractor/8muses.py b/gallery_dl/extractor/8muses.py index 42fbe129..fafb7852 100644 --- a/gallery_dl/extractor/8muses.py +++ b/gallery_dl/extractor/8muses.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.8muses.com/""" +"""Extractors for https://comics.8muses.com/""" from .common import Extractor, Message from .. import text @@ -14,30 +14,31 @@ import json class _8musesAlbumExtractor(Extractor): - """Extractor for image albums on www.8muses.com""" + """Extractor for image albums on comics.8muses.com""" category = "8muses" subcategory = "album" directory_fmt = ("{category}", "{album[path]}") filename_fmt = "{page:>03}.{extension}" archive_fmt = "{hash}" - root = "https://www.8muses.com" - pattern = (r"(?:https?://)?(?:www\.)?8muses\.com" + root = "https://comics.8muses.com" + pattern = (r"(?:https?://)?(?:comics\.|www\.)?8muses\.com" r"(/comics/album/[^?&#]+)(\?[^#]+)?") test = ( - ("https://www.8muses.com/comics/album/Fakku-Comics/santa/Im-Sorry", { - "url": "82449d6a26a29204695cba5d52c3ec60170bc159", + ("https://comics.8muses.com/comics/album/Fakku-Comics/mogg/Liar", { + "url": "6286ac33087c236c5a7e51f8a9d4e4d5548212d4", + "pattern": r"https://comics.8muses.com/image/fl/[\w-]+", "keyword": { "url" : str, "hash" : str, "page" : int, - "count": 16, + "count": 6, "album": { - "id" : 10457, - "title" : "Im Sorry", - "path" : "Fakku Comics/santa/Im Sorry", + "id" : 10467, + "title" : "Liar", + "path" : "Fakku Comics/mogg/Liar", "private": False, "url" : str, - "parent" : 10454, + "parent" : 10464, "views" : int, "likes" : int, "date" : "dt:2018-07-10 00:00:00",