diff --git a/docs/configuration.rst b/docs/configuration.rst index 58f8c09b..0fddcecf 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -1351,6 +1351,26 @@ Description Waiting a few seconds between each request tries to prevent that. +extractor.sankakucomplex.embeds +------------------------------- +Type + ``bool`` +Default + ``false`` +Description + Download video embeds from external sites. + + +extractor.sankakucomplex.videos +------------------------------- +Type + ``bool`` +Default + ``true`` +Description + Download videos. + + extractor.smugmug.videos ------------------------ Type diff --git a/gallery_dl/extractor/sankakucomplex.py b/gallery_dl/extractor/sankakucomplex.py index f6ad3271..972750c2 100644 --- a/gallery_dl/extractor/sankakucomplex.py +++ b/gallery_dl/extractor/sankakucomplex.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2019 Mike Fährmann +# Copyright 2019-2020 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 @@ -9,7 +9,7 @@ """Extractors for https://www.sankakucomplex.com/""" from .common import Extractor, Message -from .. import text +from .. import text, util import re @@ -40,6 +40,21 @@ class SankakucomplexArticleExtractor(SankakucomplexExtractor): "url": "a1e249173fd6c899a8134fcfbd9c925588a63f7c", "keyword": "e78fcc23c2711befc0969a45ea5082a29efccf68", }), + # videos (#308) + (("https://www.sankakucomplex.com/2019/06/11" + "/darling-ol-goddess-shows-off-her-plump-lower-area/"), { + "pattern": r"/wp-content/uploads/2019/06/[^/]+\d\.mp4", + "range": "26-", + "count": 5, + }), + # youtube embeds (#308) + (("https://www.sankakucomplex.com/2015/02/12" + "/snow-miku-2015-live-magical-indeed/"), { + "options": (("embeds", True),), + "pattern": r"https://www.youtube.com/embed/", + "range": "2-", + "count": 2, + }), ) def items(self): @@ -53,38 +68,44 @@ class SankakucomplexArticleExtractor(SankakucomplexExtractor): "date" : text.parse_datetime( extr('property="article:published_time" content="', '"')), } - imgs = self.images(extr) - data["count"] = len(imgs) + content = extr('