diff --git a/docs/supportedsites.rst b/docs/supportedsites.rst index 17438b29..b2f5bf73 100644 --- a/docs/supportedsites.rst +++ b/docs/supportedsites.rst @@ -91,7 +91,7 @@ Supported Sites +-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+ |Pinterest |https://www.pinterest.com |Boards, Pins, pin.it Links | | +-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+ -|Pixiv |https://www.pixiv.net/ |Images from Users, Bookmarks, Favorites, Individual Images |Required | +|Pixiv |https://www.pixiv.net/ |Images from Users, Bookmarks, Favorites, pixiv.me Links, Individual Images |Required | +-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+ |PowerManga |https://powermanga.org/ |Chapters, Manga | | +-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+ @@ -133,7 +133,7 @@ Supported Sites +-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+ |Imageontime |http://imageontime.org/ |individual Images | | +-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+ -|Imagetwist |http://imagetwist.com/ |individual Images | | +|Imagetwist |https://imagetwist.com/ |individual Images | | +-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+ |Imagevenue |http://imagevenue.com/ |individual Images | | +-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+ diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py index baff6724..6151b755 100644 --- a/gallery_dl/extractor/deviantart.py +++ b/gallery_dl/extractor/deviantart.py @@ -191,7 +191,7 @@ class DeviantartDeviationExtractor(DeviantartExtractor): class DeviantartFavoriteExtractor(DeviantartExtractor): - """Extractor for an artist's favourites""" + """Extractor for an artist's favorites""" subcategory = "favorite" directory_fmt = ["{category}", "{subcategory}", "{collection[owner]} - {collection[title]}"] @@ -245,7 +245,7 @@ class DeviantartFavoriteExtractor(DeviantartExtractor): class DeviantartJournalExtractor(DeviantartExtractor): - """Extractor for single deviations""" + """Extractor for an artist's journals""" subcategory = "journal" pattern = [r"(?:https?://)?([^.]+)\.deviantart\.com/journal/?$"] test = [("http://shimoda7.deviantart.com/journal/", { diff --git a/gallery_dl/extractor/exhentai.py b/gallery_dl/extractor/exhentai.py index 6a6c658b..9b0959bf 100644 --- a/gallery_dl/extractor/exhentai.py +++ b/gallery_dl/extractor/exhentai.py @@ -17,7 +17,7 @@ import requests class ExhentaiGalleryExtractor(Extractor): - """Extractor for image-galleries from exhentai.org""" + """Extractor for image galleries from exhentai.org""" category = "exhentai" subcategory = "gallery" directory_fmt = ["{category}", "{gallery-id}"] diff --git a/gallery_dl/extractor/flickr.py b/gallery_dl/extractor/flickr.py index 3932577e..7a542d31 100644 --- a/gallery_dl/extractor/flickr.py +++ b/gallery_dl/extractor/flickr.py @@ -213,6 +213,7 @@ class FlickrFavoriteExtractor(FlickrExtractor): class FlickrSearchExtractor(FlickrExtractor): + """Extractor for flickr photos based on search results""" subcategory = "search" directory_fmt = ["{category}", "{subcategory}", "{search[text]}"] pattern = [r"(?:https?://)?(?:www\.)?flickr\.com/search/?\?([^#]+)"] diff --git a/gallery_dl/extractor/nhentai.py b/gallery_dl/extractor/nhentai.py index 1a841133..c86920ec 100644 --- a/gallery_dl/extractor/nhentai.py +++ b/gallery_dl/extractor/nhentai.py @@ -14,7 +14,7 @@ import json class NhentaiGalleryExtractor(Extractor): - """Extractor for image-galleries from nhentai.net""" + """Extractor for image galleries from nhentai.net""" category = "nhentai" subcategory = "gallery" directory_fmt = ["{category}", "{gallery-id} {title}"] diff --git a/gallery_dl/extractor/pawoo.py b/gallery_dl/extractor/pawoo.py index b464c7c6..c37eb371 100644 --- a/gallery_dl/extractor/pawoo.py +++ b/gallery_dl/extractor/pawoo.py @@ -50,9 +50,9 @@ class PawooExtractor(Extractor): return attachments -class PawooAccountExtractor(PawooExtractor): +class PawooUserExtractor(PawooExtractor): """Extractor for all images of an account/user on pawoo.net""" - subcategory = "account" + subcategory = "user" pattern = [r"(?:https?://)?pawoo\.net/(@[^/]+)/?$"] test = [ ("https://pawoo.net/@kuroda", { diff --git a/gallery_dl/version.py b/gallery_dl/version.py index 36dbee73..cc4b4ddc 100644 --- a/gallery_dl/version.py +++ b/gallery_dl/version.py @@ -6,4 +6,4 @@ # it under the terms of the GNU General Public License version 2 as # published by the Free Software Foundation. -__version__ = "0.9.0" +__version__ = "0.9.1-dev" diff --git a/scripts/build_supportedsites.py b/scripts/build_supportedsites.py index b19a2782..590dac84 100755 --- a/scripts/build_supportedsites.py +++ b/scripts/build_supportedsites.py @@ -52,11 +52,11 @@ CATEGORY_MAP = { } SUBCATEGORY_MAP = { - "account": "Images from Users", "gallery": "Galleries", "image" : "individual Images", "issue" : "Comic-Issues", "manga" : "Manga", + "me" : "pixiv.me Links", "pinit" : "pin.it Links", "search" : "Search Results", "status" : "Images from Statuses",