From dd1e5455970da4485d81784329f2ab988e8ded57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sun, 4 Oct 2020 22:53:23 +0200 Subject: [PATCH] [hentaifoundry] rename GalleryExtractor to PicturesExtractor --- docs/supportedsites.rst | 2 +- gallery_dl/extractor/hentaifoundry.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/supportedsites.rst b/docs/supportedsites.rst index e88f9b10..4a70ca95 100644 --- a/docs/supportedsites.rst +++ b/docs/supportedsites.rst @@ -154,7 +154,7 @@ Turboimagehost https://www.turboimagehost.com/ individual Images .. |deviantart-C| replace:: Collections, Deviations, Favorites, Folders, Galleries, Journals, Popular Images, Scraps, Sta.sh, User Profiles .. |flickr-C| replace:: Albums, Favorites, Galleries, Groups, individual Images, Search Results, User Profiles .. |furaffinity-C| replace:: Favorites, Galleries, Posts, Scraps, Search Results, User Profiles -.. |hentaifoundry-C| replace:: Favorites, Galleries, individual Images, Popular Images, Recent Images, Scraps, Stories, User Profiles +.. |hentaifoundry-C| replace:: Favorites, individual Images, Pictures, Popular Images, Recent Images, Scraps, Stories, User Profiles .. |imgur-C| replace:: Albums, Favorites, Galleries, individual Images, Search Results, Subreddits, Tag Searches, User Profiles .. |instagram-C| replace:: Channels, individual Images, Saved Posts, Stories, Tag Searches, User Profiles .. |newgrounds-C| replace:: Art, Audio, Favorites, individual Images, Media Files, Movies, User Profiles diff --git a/gallery_dl/extractor/hentaifoundry.py b/gallery_dl/extractor/hentaifoundry.py index 45959a5c..5eb46b6e 100644 --- a/gallery_dl/extractor/hentaifoundry.py +++ b/gallery_dl/extractor/hentaifoundry.py @@ -162,7 +162,7 @@ class HentaifoundryUserExtractor(HentaifoundryExtractor): def items(self): user = "/user/" + self.user return self._dispatch_extractors(( - (HentaifoundryGalleryExtractor , + (HentaifoundryPicturesExtractor , self.root + "/pictures" + user), (HentaifoundryScrapsExtractor, self.root + "/pictures" + user + "/scraps"), @@ -170,11 +170,12 @@ class HentaifoundryUserExtractor(HentaifoundryExtractor): self.root + "/stories" + user), (HentaifoundryFavoriteExtractor, self.root + user + "/faves/pictures"), - ), ("gallery",)) + ), ("pictures",)) -class HentaifoundryGalleryExtractor(HentaifoundryExtractor): - subcategory = "gallery" +class HentaifoundryPicturesExtractor(HentaifoundryExtractor): + """Extractor for all pictures of a hentaifoundry user""" + subcategory = "pictures" pattern = (r"(?:https?://)?(?:www\.)?hentai-foundry\.com" r"/pictures/user/([^/]+)(?:/page/(\d+))?/?$") test = (