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

[deviantart] fix dates in image-extractor

Browse Source
This commit is contained in:
Mike Fährmann
2015-12-07 00:08:00 +01:00
parent 7d965a2897
commit 995d8578bf
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gallery_dl/extractor/deviantart.py
View File

@@ -99,7 +99,7 @@ class DeviantArtImageExtractor(Extractor):
subcategory = "image" subcategory = "image"
directory_fmt = ["{category}", "{artist}"] directory_fmt = ["{category}", "{artist}"]
filename_fmt = "{category}_{index}_{title}.{extension}" filename_fmt = "{category}_{index}_{title}.{extension}"
pattern = [r"(?:https?://)?[^\.]+\.deviantart\.com/art/.+-(\d+)$"] pattern = [r"(?:https?://)?[^\.]+\.deviantart\.com/art/.+-(\d+)"]
def __init__(self, match): def __init__(self, match):
Extractor.__init__(self) Extractor.__init__(self)
@@ -115,10 +115,12 @@ class DeviantArtImageExtractor(Extractor):
('height', '"og:image:height" content="', '"'), ('height', '"og:image:height" content="', '"'),
('url' , '"og:url" content="', '"'), ('url' , '"og:url" content="', '"'),
('description', '"og:description" content="', '"'), ('description', '"og:description" content="', '"'),
('date' , '<span class="cc-time"><a title="', '"'), (None , '<span class="tt-w">', ''),
('date' , 'title="', '"'),
), values={'category': self.category, "index": self.index})[0] ), values={'category': self.category, "index": self.index})[0]
data["description"] = text.unescape(text.unescape(data["description"]))
data["artist"] = text.extract(data["url"], "//", ".")[0] data["artist"] = text.extract(data["url"], "//", ".")[0]
data["date"] = text.extract(data["date"], "", ", ", 8)[0] data["date"] = text.extract(data["date"], ", ", " in ", len(data["title"]))[0]
text.nameext_from_url(data["image"], data) text.nameext_from_url(data["image"], data)
yield Message.Version, 1 yield Message.Version, 1
yield Message.Directory, data yield Message.Directory, data