From 49f6d7176d6014d53425de302c8e583097b5dc13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Fri, 23 Aug 2019 21:52:48 +0200 Subject: [PATCH] [deviantart] restore filenames (#392) _by_<user>_<id> --> <title>_by_<user>-<id> --- gallery_dl/extractor/deviantart.py | 6 ++++++ test/test_results.py | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py index d0da655e..bd1299bf 100644 --- a/gallery_dl/extractor/deviantart.py +++ b/gallery_dl/extractor/deviantart.py @@ -144,6 +144,9 @@ class DeviantartExtractor(Extractor): target = text.nameext_from_url(thumb, target.copy()) if target["filename"].endswith("-150"): target["filename"] = target["filename"][:-4] + if not target["filename"].count("-"): + name, _, hid = target["filename"].rpartition("_") + target["filename"] = name + "-" + hid deviation["target"] = target deviation["filename"] = target["filename"] deviation["extension"] = target["extension"] = text.ext_from_url(url) @@ -653,6 +656,9 @@ class DeviantartExtractorV2(Extractor): text.nameext_from_url(name, target) if target["filename"].endswith("-150"): target["filename"] = target["filename"][:-4] + if not target["filename"].count("-"): + name, _, hid = target["filename"].rpartition("_") + target["filename"] = name + "-" + hid deviation["target"] = target deviation["filename"] = target["filename"] deviation["extension"] = target["extension"] = ( diff --git a/test/test_results.py b/test/test_results.py index 99aa3dfb..12f24160 100644 --- a/test/test_results.py +++ b/test/test_results.py @@ -29,7 +29,6 @@ BROKEN = { "8chan", "imgth", "mangapark", - "simplyhentai", }