diff --git a/docs/supportedsites.md b/docs/supportedsites.md index 0ffb9511..3183ab51 100644 --- a/docs/supportedsites.md +++ b/docs/supportedsites.md @@ -481,12 +481,6 @@ Consider all sites to be NSFW unless otherwise known. Galleries - - LINE BLOG - https://www.lineblog.me/ - Blogs, Posts - - livedoor Blog http://blog.livedoor.jp/ diff --git a/gallery_dl/extractor/__init__.py b/gallery_dl/extractor/__init__.py index 062305aa..fa56bfb4 100644 --- a/gallery_dl/extractor/__init__.py +++ b/gallery_dl/extractor/__init__.py @@ -84,7 +84,6 @@ modules = [ "lensdump", "lexica", "lightroom", - "lineblog", "livedoor", "luscious", "lynxchan", diff --git a/gallery_dl/extractor/lineblog.py b/gallery_dl/extractor/lineblog.py deleted file mode 100644 index adb27a80..00000000 --- a/gallery_dl/extractor/lineblog.py +++ /dev/null @@ -1,73 +0,0 @@ -# -*- coding: utf-8 -*- - -# 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 -# published by the Free Software Foundation. - -"""Extractors for https://www.lineblog.me/""" - -from .livedoor import LivedoorBlogExtractor, LivedoorPostExtractor -from .. import text - - -class LineblogBase(): - """Base class for lineblog extractors""" - category = "lineblog" - root = "https://lineblog.me" - - def _images(self, post): - imgs = [] - body = post.pop("body") - - for num, img in enumerate(text.extract_iter(body, ""), 1): - src = text.extr(img, 'src="', '"') - alt = text.extr(img, 'alt="', '"') - - if not src: - continue - if src.startswith("https://obs.line-scdn.") and src.count("/") > 3: - src = src.rpartition("/")[0] - - imgs.append(text.nameext_from_url(alt or src, { - "url" : src, - "num" : num, - "hash": src.rpartition("/")[2], - "post": post, - })) - - return imgs - - -class LineblogBlogExtractor(LineblogBase, LivedoorBlogExtractor): - """Extractor for a user's blog on lineblog.me""" - pattern = r"(?:https?://)?lineblog\.me/(\w+)/?(?:$|[?#])" - test = ("https://lineblog.me/mamoru_miyano/", { - "range": "1-20", - "count": 20, - "pattern": r"https://obs.line-scdn.net/[\w-]+$", - "keyword": { - "post": { - "categories" : tuple, - "date" : "type:datetime", - "description": str, - "id" : int, - "tags" : list, - "title" : str, - "user" : "mamoru_miyano" - }, - "filename": str, - "hash" : r"re:\w{32,}", - "num" : int, - }, - }) - - -class LineblogPostExtractor(LineblogBase, LivedoorPostExtractor): - """Extractor for blog posts on lineblog.me""" - pattern = r"(?:https?://)?lineblog\.me/(\w+)/archives/(\d+)" - test = ("https://lineblog.me/mamoru_miyano/archives/1919150.html", { - "url": "24afeb4044c554f80c374b52bf8109c6f1c0c757", - "keyword": "76a38e2c0074926bd3362f66f9fc0e6c41591dcb", - }) diff --git a/scripts/supportedsites.py b/scripts/supportedsites.py index f90af3e3..c25a21bd 100755 --- a/scripts/supportedsites.py +++ b/scripts/supportedsites.py @@ -66,7 +66,6 @@ CATEGORY_MAP = { "jpgfish" : "JPG Fish", "kabeuchi" : "かべうち", "kemonoparty" : "Kemono", - "lineblog" : "LINE BLOG", "livedoor" : "livedoor Blog", "ohpolly" : "Oh Polly", "omgmiamiswimwear": "Omg Miami Swimwear",