From 995d8578bfe40a8de6997e0e81cbe2a306a8a253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Mon, 7 Dec 2015 00:08:00 +0100 Subject: [PATCH] [deviantart] fix dates in image-extractor --- gallery_dl/extractor/deviantart.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py index c67de641..fd0fe398 100644 --- a/gallery_dl/extractor/deviantart.py +++ b/gallery_dl/extractor/deviantart.py @@ -99,7 +99,7 @@ class DeviantArtImageExtractor(Extractor): subcategory = "image" directory_fmt = ["{category}", "{artist}"] filename_fmt = "{category}_{index}_{title}.{extension}" - pattern = [r"(?:https?://)?[^\.]+\.deviantart\.com/art/.+-(\d+)$"] + pattern = [r"(?:https?://)?[^\.]+\.deviantart\.com/art/.+-(\d+)"] def __init__(self, match): Extractor.__init__(self) @@ -115,10 +115,12 @@ class DeviantArtImageExtractor(Extractor): ('height', '"og:image:height" content="', '"'), ('url' , '"og:url" content="', '"'), ('description', '"og:description" content="', '"'), - ('date' , '', ''), + ('date' , 'title="', '"'), ), values={'category': self.category, "index": self.index})[0] + data["description"] = text.unescape(text.unescape(data["description"])) 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) yield Message.Version, 1 yield Message.Directory, data