diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py index 7d154e91..baff6724 100644 --- a/gallery_dl/extractor/deviantart.py +++ b/gallery_dl/extractor/deviantart.py @@ -249,7 +249,7 @@ class DeviantartJournalExtractor(DeviantartExtractor): subcategory = "journal" pattern = [r"(?:https?://)?([^.]+)\.deviantart\.com/journal/?$"] test = [("http://shimoda7.deviantart.com/journal/", { - "url": "1637f60bd94dc21da9130c8d84f85009b754cd70", + "url": "f7960ae06e774d6931c61ad309c95a10710658b2", "keyword": "9ddc2e130198395c1dfaa55c65b6bf63713ec0a8", })] diff --git a/gallery_dl/extractor/flickr.py b/gallery_dl/extractor/flickr.py index 28cbd85a..3932577e 100644 --- a/gallery_dl/extractor/flickr.py +++ b/gallery_dl/extractor/flickr.py @@ -110,9 +110,10 @@ class FlickrAlbumExtractor(FlickrExtractor): "{album[id]} - {album[title]}"] pattern = [r"(?:https?://)?(?:www\.)?flickr\.com/" r"photos/([^/]+)/(?:album|set)s/(\d+)"] - test = [("https://www.flickr.com/photos/flickr/albums/72157656845052880", { - "url": "517db3faa55e88686f1d00a379f8f0daf4c7b837", - "keyword": "001fb1c99a6331cf69d72392af3badf95e8fe51e", + test = [(("https://www.flickr.com/photos/" + "shona_s/albums/72157633471741607"), { + "url": "baf4a3d1b15afcecf9638000a12c0eb3d5df9024", + "keyword": "40605c5b22feafcd029d1121f4dc8786b0aa7dcc", })] def __init__(self, match): @@ -280,7 +281,7 @@ class FlickrAPI(): "Could not match '%s' to any format", self.maxsize) if self.maxsize: self.formats = [fmt for fmt in self.FORMATS - if not fmt[2] or fmt[2] < self.maxsize] + if not fmt[2] or fmt[2] <= self.maxsize] else: self.formats = self.FORMATS self.formats = self.formats[:4] diff --git a/gallery_dl/extractor/foolslide.py b/gallery_dl/extractor/foolslide.py index 6b7f4024..e202d38e 100644 --- a/gallery_dl/extractor/foolslide.py +++ b/gallery_dl/extractor/foolslide.py @@ -79,7 +79,7 @@ class FoolslideChapterExtractor(Extractor): parts = chapter.split(":", maxsplit=1) title = parts[1].strip() if len(parts) > 1 else "" - self.data["manga"] = text.unescape(manga) + self.data["manga"] = text.unescape(manga).strip() self.data["title"] = title self.data["language"] = util.code_to_language(self.data["lang"]) self.data["chapter_string"] = chapter diff --git a/gallery_dl/extractor/jaiminisbox.py b/gallery_dl/extractor/jaiminisbox.py index 1b6cb758..a6f15e30 100644 --- a/gallery_dl/extractor/jaiminisbox.py +++ b/gallery_dl/extractor/jaiminisbox.py @@ -15,10 +15,15 @@ class JaiminisboxChapterExtractor(foolslide.FoolslideChapterExtractor): """Extractor for manga-chapters from jaiminisbox.com""" category = "jaiminisbox" pattern = foolslide.chapter_pattern(r"(?:www\.)?jaiminisbox\.com/reader") - test = [("https://jaiminisbox.com/reader/read/uratarou/en/0/1/", { - "url": "f021de7f31ee3a3f688fdf3e8183aef4226c2b50", - "keyword": "d187df3e3b6dbe09ec163626f6fd7c57133ab163", - })] + test = [ + ("https://jaiminisbox.com/reader/read/uratarou/en/0/1/", { + "url": "f021de7f31ee3a3f688fdf3e8183aef4226c2b50", + "keyword": "d187df3e3b6dbe09ec163626f6fd7c57133ab163", + }), + ("https://jaiminisbox.com/reader/read/dr-stone/en/0/16/", { + "keyword": "6b6896d98a2eb8f38e9b7f5242a547b826da2599", + }), + ] class JaiminisboxMangaExtractor(foolslide.FoolslideMangaExtractor):