Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-22 18:53:21 +01:00
Code Issues Releases Wiki Activity

[pinterest] improvements

Browse Source 
- add stop condition for pin-related pins
- improve URL patterns
- make Pylint happy
This commit is contained in:
Mike Fährmann 2018-08-16 18:11:39 +02:00
parent 2801a0d997
commit d3f1eed2a6
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gallery_dl/extractor/pinterest.py
View File

@ -36,7 +36,14 @@ class PinterestExtractor(Extractor):
pin_data.update(data)
yield Message.Url, url, pin_data
def data_from_pin(self, pin):
def metadata(self):
"""Return general metadata"""
def pins(self):
"""Return all relevant pin-objects"""
@staticmethod
def data_from_pin(pin):
"""Get image url and metadata from a pin-object"""
img = pin["images"]["orig"]
url = img["url"]
@ -48,7 +55,7 @@ class PinterestExtractor(Extractor):
class PinterestPinExtractor(PinterestExtractor):
"""Extractor for images from a single pin from pinterest.com"""
subcategory = "pin"
pattern = [BASE_PATTERN + r"/pin/([^/?#&]+)/?$"]
pattern = [BASE_PATTERN + r"/pin/([^/?#&]+)(?!.*#related$)"]
test = [
("https://www.pinterest.com/pin/858146903966145189/", {
"url": "afb3c26719e3a530bb0e871c480882a801a4e8a5",
@ -79,7 +86,7 @@ class PinterestBoardExtractor(PinterestExtractor):
subcategory = "board"
directory_fmt = ["{category}", "{board[owner][username]}", "{board[name]}"]
archive_fmt = "{board[id]}_{id}"
pattern = [BASE_PATTERN + r"/(?!pin/)([^/?#&]+)/([^/?#&]+)/?$"]
pattern = [BASE_PATTERN + r"/(?!pin/)([^/?#&]+)/([^/?#&]+)(?!.*#related$)"]
test = [
("https://www.pinterest.com/g1952849/test-/", {
"url": "85911dfca313f3f7f48c2aa0bc684f539d1d80a6",
@ -108,7 +115,7 @@ class PinterestRelatedPinExtractor(PinterestPinExtractor):
"""Extractor for related pins of another pin from pinterest.com"""
subcategory = "related-pin"
directory_fmt = ["{category}", "related {original_pin[id]}"]
pattern = [BASE_PATTERN + r"/pin/([^/?#&]+)/?#related$"]
pattern = [BASE_PATTERN + r"/pin/([^/?#&]+).*#related$"]
test = [
("https://www.pinterest.com/pin/858146903966145189/#related", {
"range": (1, 50),
@ -129,7 +136,7 @@ class PinterestRelatedBoardExtractor(PinterestBoardExtractor):
subcategory = "related-board"
directory_fmt = ["{category}", "{board[owner][username]}",
"{board[name]}", "related"]
pattern = [BASE_PATTERN + r"/(?!pin/)([^/?#&]+)/([^/?#&]+)/?#related$"]
pattern = [BASE_PATTERN + r"/(?!pin/)([^/?#&]+)/([^/?#&]+).*#related$"]
test = [
("https://www.pinterest.com/g1952849/test-/#related", {
"range": (1, 50),
@ -244,7 +251,8 @@ class PinterestAPI():
try:
bookmarks = data["resource"]["options"]["bookmarks"]
if not bookmarks or bookmarks[0] == "-end-":
if (not bookmarks or bookmarks[0] == "-end-" or
bookmarks[0].startswith("Y2JOb25lO")):
return
options["bookmarks"] = bookmarks
except KeyError: