github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update extractor docstrings

Browse Source
This commit is contained in:
Mike Fährmann
2017-06-28 17:39:07 +02:00
parent b757687606
commit 1dac76fd1c
8 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/supportedsites.rst
View File

@@ -91,7 +91,7 @@ Supported Sites
+-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+ +-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+
|Pinterest |https://www.pinterest.com |Boards, Pins, pin.it Links | | |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 | | |PowerManga |https://powermanga.org/ |Chapters, Manga | |
+-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+ +-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+
@@ -133,7 +133,7 @@ Supported Sites
+-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+ +-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+
|Imageontime |http://imageontime.org/ |individual Images | | |Imageontime |http://imageontime.org/ |individual Images | |
+-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+ +-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+
|Imagetwist |http://imagetwist.com/ |individual Images | | |Imagetwist |https://imagetwist.com/ |individual Images | |
+-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+ +-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+
|Imagevenue |http://imagevenue.com/ |individual Images | | |Imagevenue |http://imagevenue.com/ |individual Images | |
+-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+ +-------------------+---------------------------------------+------------------------------------------------------------------------------------------+----------------+

4
gallery_dl/extractor/deviantart.py
View File

@@ -191,7 +191,7 @@ class DeviantartDeviationExtractor(DeviantartExtractor):
class DeviantartFavoriteExtractor(DeviantartExtractor): class DeviantartFavoriteExtractor(DeviantartExtractor):
"""Extractor for an artist's favourites""" """Extractor for an artist's favorites"""
subcategory = "favorite" subcategory = "favorite"
directory_fmt = ["{category}", "{subcategory}", directory_fmt = ["{category}", "{subcategory}",
"{collection[owner]} - {collection[title]}"] "{collection[owner]} - {collection[title]}"]
@@ -245,7 +245,7 @@ class DeviantartFavoriteExtractor(DeviantartExtractor):
class DeviantartJournalExtractor(DeviantartExtractor): class DeviantartJournalExtractor(DeviantartExtractor):
"""Extractor for single deviations""" """Extractor for an artist's journals"""
subcategory = "journal" subcategory = "journal"
pattern = [r"(?:https?://)?([^.]+)\.deviantart\.com/journal/?$"] pattern = [r"(?:https?://)?([^.]+)\.deviantart\.com/journal/?$"]
test = [("http://shimoda7.deviantart.com/journal/", { test = [("http://shimoda7.deviantart.com/journal/", {

2
gallery_dl/extractor/exhentai.py
View File

@@ -17,7 +17,7 @@ import requests
class ExhentaiGalleryExtractor(Extractor): class ExhentaiGalleryExtractor(Extractor):
"""Extractor for image-galleries from exhentai.org""" """Extractor for image galleries from exhentai.org"""
category = "exhentai" category = "exhentai"
subcategory = "gallery" subcategory = "gallery"
directory_fmt = ["{category}", "{gallery-id}"] directory_fmt = ["{category}", "{gallery-id}"]

1
gallery_dl/extractor/flickr.py
View File

@@ -213,6 +213,7 @@ class FlickrFavoriteExtractor(FlickrExtractor):
class FlickrSearchExtractor(FlickrExtractor): class FlickrSearchExtractor(FlickrExtractor):
"""Extractor for flickr photos based on search results"""
subcategory = "search" subcategory = "search"
directory_fmt = ["{category}", "{subcategory}", "{search[text]}"] directory_fmt = ["{category}", "{subcategory}", "{search[text]}"]
pattern = [r"(?:https?://)?(?:www\.)?flickr\.com/search/?\?([^#]+)"] pattern = [r"(?:https?://)?(?:www\.)?flickr\.com/search/?\?([^#]+)"]

2
gallery_dl/extractor/nhentai.py
View File

@@ -14,7 +14,7 @@ import json
class NhentaiGalleryExtractor(Extractor): class NhentaiGalleryExtractor(Extractor):
"""Extractor for image-galleries from nhentai.net""" """Extractor for image galleries from nhentai.net"""
category = "nhentai" category = "nhentai"
subcategory = "gallery" subcategory = "gallery"
directory_fmt = ["{category}", "{gallery-id} {title}"] directory_fmt = ["{category}", "{gallery-id} {title}"]

4
gallery_dl/extractor/pawoo.py
View File

@@ -50,9 +50,9 @@ class PawooExtractor(Extractor):
return attachments return attachments
class PawooAccountExtractor(PawooExtractor): class PawooUserExtractor(PawooExtractor):
"""Extractor for all images of an account/user on pawoo.net""" """Extractor for all images of an account/user on pawoo.net"""
subcategory = "account" subcategory = "user"
pattern = [r"(?:https?://)?pawoo\.net/(@[^/]+)/?$"] pattern = [r"(?:https?://)?pawoo\.net/(@[^/]+)/?$"]
test = [ test = [
("https://pawoo.net/@kuroda", { ("https://pawoo.net/@kuroda", {

2
gallery_dl/version.py
View File

@@ -6,4 +6,4 @@
# it under the terms of the GNU General Public License version 2 as # it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation. # published by the Free Software Foundation.
__version__ = "0.9.0" __version__ = "0.9.1-dev"

2
scripts/build_supportedsites.py
View File

@@ -52,11 +52,11 @@ CATEGORY_MAP = {
} }
SUBCATEGORY_MAP = { SUBCATEGORY_MAP = {
"account": "Images from Users",
"gallery": "Galleries", "gallery": "Galleries",
"image" : "individual Images", "image" : "individual Images",
"issue" : "Comic-Issues", "issue" : "Comic-Issues",
"manga" : "Manga", "manga" : "Manga",
"me" : "pixiv.me Links",
"pinit" : "pin.it Links", "pinit" : "pin.it Links",
"search" : "Search Results", "search" : "Search Results",
"status" : "Images from Statuses", "status" : "Images from Statuses",