diff --git a/docs/supportedsites.rst b/docs/supportedsites.rst index 829f2183..19015feb 100644 --- a/docs/supportedsites.rst +++ b/docs/supportedsites.rst @@ -94,7 +94,7 @@ Patreon https://www.patreon.com/ Creators, Posts, User P Pawoo https://pawoo.net/ Images from Statuses, User Profiles `OAuth `__ Photobucket https://photobucket.com/ Albums, individual Images Piczel https://piczel.tv/ Folders, individual Images, User Profiles -Pinterest https://www.pinterest.com/ Boards, Pins, pin.it Links, related Pins, Sections Supported +Pinterest https://www.pinterest.com/ |pinterest-C| Supported Pixiv https://www.pixiv.net/ |pixiv-C| Required Pixnet https://www.pixnet.net/ Folders, individual Images, Sets, User Profiles Plurk https://www.plurk.com/ Posts, Timelines @@ -160,6 +160,7 @@ Turboimagehost https://www.turboimagehost.com/ individual Images .. |instagram-C| replace:: Channels, Highlights, Posts, Saved Posts, Stories, Tag Searches, User Profiles .. |newgrounds-C| replace:: Art, Audio, Favorites, individual Images, Media Files, Movies, User Profiles .. |nijie-C| replace:: Doujin, Favorites, Illustrations, individual Images, User Profiles +.. |pinterest-C| replace:: Pins, pin.it Links, related Pins, Sections, User Profiles .. |pixiv-C| replace:: Favorites, Follows, pixiv.me Links, Rankings, Search Results, User Profiles, individual Images .. |reddit-C| replace:: individual Images, Submissions, Subreddits, User Profiles .. |smugmug-C| replace:: Albums, individual Images, Images from Users and Folders diff --git a/gallery_dl/extractor/pinterest.py b/gallery_dl/extractor/pinterest.py index db3ebe93..334412d5 100644 --- a/gallery_dl/extractor/pinterest.py +++ b/gallery_dl/extractor/pinterest.py @@ -168,14 +168,17 @@ class PinterestBoardExtractor(PinterestExtractor): return self.api.board_pins(board["id"]) -class PinterestBoardsExtractor(PinterestExtractor): - """Extractor for a user's boards """ - subcategory = "boards" - pattern = BASE_PATTERN + r"/(?!pin/)([^/?#&]+)/_saved/?$" - test = ("https://www.pinterest.de/g1952849/_saved/", { - "pattern": PinterestBoardExtractor.pattern, - "count": ">= 2", - }) +class PinterestUserExtractor(PinterestExtractor): + """Extractor for a user's boards""" + subcategory = "user" + pattern = BASE_PATTERN + r"/(?!pin/)([^/?#&]+)(?:/_saved)?/?$" + test = ( + ("https://www.pinterest.de/g1952849/", { + "pattern": PinterestBoardExtractor.pattern, + "count": ">= 2", + }), + ("https://www.pinterest.de/g1952849/_saved/"), + ) def __init__(self, match): PinterestExtractor.__init__(self, match)