@kattjevfel suggested changes

mikf · Sep 23, 2020 · e1117c0 · e1117c0
1 parent 2617893
commit e1117c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/docs/supportedsites.rst b/docs/supportedsites.rst
@@ -129,7 +129,7 @@ Twitter              https://twitter.com/                |twitter-C|
 VSCO                 https://vsco.co/                    Collections, individual Images, User Profiles
 Wallhaven            https://wallhaven.cc/               individual Images, Search Results                  Optional (`API Key <configuration.rst#extractorwallhavenapi-key>`__)
 Warosu               https://warosu.org/                 Threads
-Weasyl               https://weasyl.com/                 Submissions, Folders, Journals
+Weasyl               https://www.weasyl.com/             |weasyl-C|
 Webtoon              https://www.webtoons.com/           Comics, Episodes
 Weibo                https://www.weibo.com/              Images from Statuses, User Profiles
 WikiArt.org          https://www.wikiart.org/            Artists, Artist Listings, Artworks
@@ -164,4 +164,5 @@ Turboimagehost       https://www.turboimagehost.com/     individual Images
 .. |reddit-C| replace:: individual Images, Submissions, Subreddits, User Profiles
 .. |smugmug-C| replace:: Albums, individual Images, Images from Users and Folders
 .. |twitter-C| replace:: Bookmarks, Likes, Media Timelines, Search Results, Timelines, Tweets
+.. |weasyl-C| replace:: Folders, Journals, Journals, Submissions, Submissions
 .. |yuki-S| replace:: yuki.la 4chan archive
diff --git a/gallery_dl/extractor/weasyl.py b/gallery_dl/extractor/weasyl.py
@@ -16,7 +16,7 @@
 class WeasylExtractor(Extractor):
     category = "weasyl"
     directory_fmt = ("{category}", "{owner_login}")
-    filename_fmt = "{date}_{filename}.{extension}"
+    filename_fmt = "{category}_{filename}_{date}.{extension}"
     archive_fmt = "{submitid}"
     root = "https://www.weasyl.com"
 
@@ -143,7 +143,7 @@ def items(self):
 
 class WeasylJournalExtractor(WeasylExtractor):
     subcategory = "journal"
-    filename_fmt = "{date}_{owner_login}_{title}.{extension}"
+    filename_fmt = "{category}_{owner_login}_{title}_{date}.{extension}"
     archive_fmt = "{journalid}"
     pattern = BASE_PATTERN + r"journal/(\d+)/?([\w\d-]+)?"
     test = (
@@ -184,7 +184,7 @@ def items(self):
 
 class WeasylJournalsExtractor(WeasylExtractor):
     subcategory = "journals"
-    filename_fmt = "{date}_{owner_login}_{title}.{extension}"
+    filename_fmt = "{category}_{owner_login}_{title}_{date}.{extension}"
     archive_fmt = "{journalid}"
     pattern = BASE_PATTERN + r"journals/([\w\d]+)"
     test = (