From d12a5e440a0e1c4a5a00706ee6da289a842f75fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Thu, 24 Aug 2023 15:01:26 +0200 Subject: [PATCH] update docs/supportedsites --- docs/supportedsites.md | 30 +++++++++++++------------- gallery_dl/extractor/imagehosts.py | 34 ++++++++++++++++++------------ scripts/supportedsites.py | 2 +- 3 files changed, 37 insertions(+), 29 deletions(-) diff --git a/docs/supportedsites.md b/docs/supportedsites.md index e095743f..676ba938 100644 --- a/docs/supportedsites.md +++ b/docs/supportedsites.md @@ -88,7 +88,7 @@ Consider all sites to be NSFW unless otherwise known. ArtStation https://www.artstation.com/ - Albums, Artwork Listings, Challenges, individual Images, Likes, Search Results, User Profiles + Albums, Artwork Listings, Challenges, Followed Users, individual Images, Likes, Search Results, User Profiles @@ -148,7 +148,7 @@ Consider all sites to be NSFW unless otherwise known. DeviantArt https://www.deviantart.com/ - Collections, Deviations, Favorites, Folders, Galleries, Gallery Searches, Journals, Popular Images, Scraps, Search Results, Sta.sh, Status Updates, Tag Searches, User Profiles, Watches + Collections, Deviations, Favorites, Folders, Followed Users, Galleries, Gallery Searches, Journals, Popular Images, Scraps, Search Results, Sta.sh, Status Updates, Tag Searches, User Profiles, Watches OAuth @@ -226,7 +226,7 @@ Consider all sites to be NSFW unless otherwise known. Fur Affinity https://www.furaffinity.net/ - Favorites, Galleries, Posts, Scraps, Search Results, User Profiles + Favorites, Followed Users, Galleries, Posts, Scraps, Search Results, User Profiles Cookies @@ -357,7 +357,7 @@ Consider all sites to be NSFW unless otherwise known. Imagevenue - https://imagevenue.com/ + https://www.imagevenue.com/ individual Images @@ -406,13 +406,13 @@ Consider all sites to be NSFW unless otherwise known. Inkbunny https://inkbunny.net/ - Favorites, Pools, Posts, Search Results, User Profiles + Favorites, Followed Users, Pools, Posts, Search Results, User Profiles Supported Instagram https://www.instagram.com/ - Avatars, Collections, Guides, Highlights, Posts, Reels, Saved Posts, Stories, Tag Searches, Tagged Posts, User Profiles + Avatars, Collections, Followed Users, Guides, Highlights, Posts, Reels, Saved Posts, Stories, Tag Searches, Tagged Posts, User Profiles Cookies @@ -574,7 +574,7 @@ Consider all sites to be NSFW unless otherwise known. Newgrounds https://www.newgrounds.com/ - Art, Audio, Favorites, Games, individual Images, Media Files, Movies, Search Results, User Profiles + Art, Audio, Favorites, Followed Users, Games, individual Images, Media Files, Movies, Search Results, User Profiles Supported @@ -778,7 +778,7 @@ Consider all sites to be NSFW unless otherwise known. Skeb https://skeb.jp/ - Posts, Search Results, User Profiles + Followed Users, Posts, Search Results, User Profiles @@ -874,7 +874,7 @@ Consider all sites to be NSFW unless otherwise known. Twitter https://twitter.com/ - Avatars, Backgrounds, Bookmarks, Events, Hashtags, individual Images, Likes, Lists, List Members, Media Timelines, Search Results, Timelines, Tweets, User Profiles + Avatars, Backgrounds, Bookmarks, Events, Followed Users, Hashtags, individual Images, Likes, Lists, List Members, Media Timelines, Search Results, Timelines, Tweets, User Profiles Supported @@ -1160,19 +1160,19 @@ Consider all sites to be NSFW unless otherwise known. Misskey.io https://misskey.io/ - Favorites, Images from Notes, User Profiles + Favorites, Followed Users, Images from Notes, User Profiles Lesbian.energy https://lesbian.energy/ - Favorites, Images from Notes, User Profiles + Favorites, Followed Users, Images from Notes, User Profiles Sushi.ski https://sushi.ski/ - Favorites, Images from Notes, User Profiles + Favorites, Followed Users, Images from Notes, User Profiles @@ -1472,19 +1472,19 @@ Consider all sites to be NSFW unless otherwise known. mastodon.social https://mastodon.social/ - Bookmarks, Images from Statuses, User Profiles + Bookmarks, Followed Users, Images from Statuses, User Profiles OAuth Pawoo https://pawoo.net/ - Bookmarks, Images from Statuses, User Profiles + Bookmarks, Followed Users, Images from Statuses, User Profiles OAuth baraag https://baraag.net/ - Bookmarks, Images from Statuses, User Profiles + Bookmarks, Followed Users, Images from Statuses, User Profiles OAuth diff --git a/gallery_dl/extractor/imagehosts.py b/gallery_dl/extractor/imagehosts.py index 8ef51b0a..5c7e42e9 100644 --- a/gallery_dl/extractor/imagehosts.py +++ b/gallery_dl/extractor/imagehosts.py @@ -265,7 +265,7 @@ class PixhostImageExtractor(ImagehostImageExtractor): category = "pixhost" pattern = (r"(?:https?://)?((?:www\.)?pixhost\.(?:to|org)" r"/show/\d+/(\d+)_[^/?#]+)") - test = ("http://pixhost.to/show/190/130327671_test-.png", { + test = ("https://pixhost.to/show/190/130327671_test-.png", { "url": "4e5470dcf6513944773044d40d883221bbc46cff", "keyword": "3bad6d59db42a5ebbd7842c2307e1c3ebd35e6b0", "content": "0c8768055e4e20e7c7259608b67799171b691140", @@ -300,13 +300,18 @@ class PixhostGalleryExtractor(ImagehostImageExtractor): class PostimgImageExtractor(ImagehostImageExtractor): """Extractor for single images from postimages.org""" category = "postimg" - pattern = (r"(?:https?://)?((?:www\.)?(?:postimg|pixxxels)\.(?:cc|org)" - r"/(?!gallery/)(?:image/)?([^/?#]+)/?)") - test = ("https://postimg.cc/Wtn2b3hC", { - "url": "72f3c8b1d6c6601a20ad58f35635494b4891a99e", - "keyword": "2d05808d04e4e83e33200db83521af06e3147a84", - "content": "cfaa8def53ed1a575e0c665c9d6d8cf2aac7a0ee", - }) + pattern = (r"(?:https?://)?((?:www\.)?(?:postim(?:ages|g)|pixxxels)" + r"\.(?:cc|org)/(?!gallery/)(?:image/)?([^/?#]+)/?)") + test = ( + ("https://postimages.org/Wtn2b3hC"), + ("https://www.postimages.org/Wtn2b3hC"), + ("https://pixxxels.cc/Wtn2b3hC"), + ("https://postimg.cc/Wtn2b3hC", { + "url": "72f3c8b1d6c6601a20ad58f35635494b4891a99e", + "keyword": "2d05808d04e4e83e33200db83521af06e3147a84", + "content": "cfaa8def53ed1a575e0c665c9d6d8cf2aac7a0ee", + }), + ) def get_info(self, page): pos = page.index(' id="download"') @@ -385,11 +390,14 @@ class FappicImageExtractor(ImagehostImageExtractor): """Extractor for single images from fappic.com""" category = "fappic" pattern = r"(?:https?://)?((?:www\.)?fappic\.com/(\w+)/[^/?#]+)" - test = ("https://www.fappic.com/98wxqcklyh8k/test.png", { - "pattern": r"https://img\d+\.fappic\.com/img/\w+/test\.png", - "keyword": "433b1d310b0ff12ad8a71ac7b9d8ba3f8cd1e898", - "content": "0c8768055e4e20e7c7259608b67799171b691140", - }) + test = ( + ("https://fappic.com/98wxqcklyh8k/test.png"), + ("https://www.fappic.com/98wxqcklyh8k/test.png", { + "pattern": r"https://img\d+\.fappic\.com/img/\w+/test\.png", + "keyword": "433b1d310b0ff12ad8a71ac7b9d8ba3f8cd1e898", + "content": "0c8768055e4e20e7c7259608b67799171b691140", + }), + ) def get_info(self, page): url , pos = text.extract(page, '