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

adjust format strings with optional titles

Browse Source 
... except for anything manga/comic related
This commit is contained in:
Mike Fährmann
2017-09-28 18:00:19 +02:00
parent c1f0afe4c6
commit 82ea6c0cd3
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gallery_dl/extractor/chan.py
View File

@@ -18,7 +18,7 @@ class ChanThreadExtractor(Extractor):
"""Base class for extractors for Futaba Channel-like boards""" """Base class for extractors for Futaba Channel-like boards"""
category = "chan" category = "chan"
subcategory = "thread" subcategory = "thread"
directory_fmt = ["{category}", "{board}-{thread}"] directory_fmt = ["{category}", "{board}", "{thread} - {title}"]
filename_fmt = "{tim}-{filename}{ext}" filename_fmt = "{tim}-{filename}{ext}"
api_url = "" api_url = ""
file_url = "" file_url = ""
@@ -67,7 +67,7 @@ class FoolfuukaThreadExtractor(SharedConfigExtractor):
basecategory = "foolfuuka" basecategory = "foolfuuka"
subcategory = "thread" subcategory = "thread"
directory_fmt = ["{category}", "{board[shortname]}", directory_fmt = ["{category}", "{board[shortname]}",
"{thread_num} - {title}"] "{thread_num}{title:? - //}"]
filename_fmt = "{media[media]}" filename_fmt = "{media[media]}"
root = "" root = ""
referer = True referer = True

4
gallery_dl/extractor/fallenangels.py
View File

@@ -81,8 +81,8 @@ class FallenangelsMangaExtractor(MangaExtractor):
scheme = "https" scheme = "https"
test = [ test = [
("http://manga.fascans.com/manga/trinity-seven", { ("http://manga.fascans.com/manga/trinity-seven", {
"url": "17acbfb97fcad16fea32009ec580b7e5931313a3", "url": "b4904e25f023cff7174dd3f73000db4d4e81a4e2",
"keyword": "707975dfb95855c8cba2e18a7405a77444c9280b", "keyword": "042eabfa6067fde9e3502edb7e9c8df2dbed8ac6",
}), }),
("https://truyen.fascans.com/manga/rakudai-kishi-no-eiyuutan", { ("https://truyen.fascans.com/manga/rakudai-kishi-no-eiyuutan", {
"url": "51a731a6b82d5eb7a335fbae6b02d06aeb2ab07b", "url": "51a731a6b82d5eb7a335fbae6b02d06aeb2ab07b",

4
gallery_dl/extractor/imgur.py
View File

@@ -52,7 +52,7 @@ class ImgurExtractor(Extractor):
class ImgurImageExtractor(ImgurExtractor): class ImgurImageExtractor(ImgurExtractor):
"""Extractor for individual images from imgur.com""" """Extractor for individual images from imgur.com"""
subcategory = "image" subcategory = "image"
filename_fmt = "{category}_{hash}_{title}.{extension}" filename_fmt = "{category}_{hash}{title:?_//}.{extension}"
pattern = [(r"(?:https?://)?(?:m\.|www\.)?imgur\.com/" pattern = [(r"(?:https?://)?(?:m\.|www\.)?imgur\.com/"
r"(?:gallery/)?((?!gallery)[^/?&#]{7})/?"), r"(?:gallery/)?((?!gallery)[^/?&#]{7})/?"),
(r"(?:https?://)?i\.imgur\.com/([^/?&#.]{5,7})\.")] (r"(?:https?://)?i\.imgur\.com/([^/?&#.]{5,7})\.")]
@@ -88,7 +88,7 @@ class ImgurImageExtractor(ImgurExtractor):
class ImgurAlbumExtractor(ImgurExtractor): class ImgurAlbumExtractor(ImgurExtractor):
"""Extractor for image albums from imgur.com""" """Extractor for image albums from imgur.com"""
subcategory = "album" subcategory = "album"
directory_fmt = ["{category}", "{album[hash]} - {album[title]}"] directory_fmt = ["{category}", "{album[hash]}{album[title]:? - //}"]
filename_fmt = "{category}_{album[hash]}_{num:>03}_{hash}.{extension}" filename_fmt = "{category}_{album[hash]}_{num:>03}_{hash}.{extension}"
pattern = [r"(?:https?://)?(?:m\.|www\.)?imgur\.com/" pattern = [r"(?:https?://)?(?:m\.|www\.)?imgur\.com/"
r"(?:a|gallery)/([^/?&#]{5})/?$"] r"(?:a|gallery)/([^/?&#]{5})/?$"]