diff --git a/CHANGELOG.md b/CHANGELOG.md index 625018a5..18ef042a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## Unreleased + ## 1.9.0 - 2019-07-19 ### Additions - Support for diff --git a/docs/supportedsites.rst b/docs/supportedsites.rst index 2a1a1ed8..b3299448 100644 --- a/docs/supportedsites.rst +++ b/docs/supportedsites.rst @@ -13,6 +13,7 @@ Site URL Capabilities 8chan https://8ch.net/ Threads 8muses https://www.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 Archive of Sins https://archiveofsins.com/ Threads Archived.Moe https://archived.moe/ Threads diff --git a/gallery_dl/extractor/__init__.py b/gallery_dl/extractor/__init__.py index 189c163d..d95c28d8 100644 --- a/gallery_dl/extractor/__init__.py +++ b/gallery_dl/extractor/__init__.py @@ -17,6 +17,7 @@ modules = [ "500px", "8chan", "8muses", + "adultempire", "artstation", "behance", "bobx", diff --git a/gallery_dl/extractor/adultempire.py b/gallery_dl/extractor/adultempire.py new file mode 100644 index 00000000..d87eb00a --- /dev/null +++ b/gallery_dl/extractor/adultempire.py @@ -0,0 +1,58 @@ +# -*- coding: utf-8 -*- + +# Copyright 2019 Mike Fährmann +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. + +"""Extractors for https://www.adultempire.com/""" + +from .common import GalleryExtractor +from .. import text + + +class AdultempireGalleryExtractor(GalleryExtractor): + """Extractor for image galleries from www.adultempire.com""" + category = "adultempire" + root = "https://www.adultempire.com" + pattern = (r"(?:https?://)?(?:www\.)?adult(?:dvd)?empire\.com" + r"(/(\d+)/gallery\.html)") + test = ( + ("https://www.adultempire.com/5998/gallery.html", { + "range": "1", + "keyword": "9057a960a7224873431612e4c95b88b2e8b5c97b", + "content": "5c6beb31e5e3cdc90ee5910d5c30f9aaec977b9e", + }), + ("https://www.adultdvdempire.com/5683/gallery.html", { + "url": "b12cd1a65cae8019d837505adb4d6a2c1ed4d70d", + "keyword": "59fe5d95929efc5040a819a5f77aba7a022bb85a", + }), + ) + + def __init__(self, match): + GalleryExtractor.__init__(self, match) + self.gallery_id = match.group(2) + + def metadata(self, page): + extr = text.extract_from(page, page.index('
')) + return { + "gallery_id": text.parse_int(self.gallery_id), + "title" : text.unescape(extr('title="', '"')), + "studio" : extr(">studio", "<").strip(), + "date" : text.parse_datetime(extr( + ">released", "<").strip(), "%m/%d/%Y"), + "actors" : text.split_html(extr( + '