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

fix URL patterns

Browse Source 
allow https:// as well as http://
This commit is contained in:
Mike Fährmann
2019-04-05 12:15:28 +02:00
parent 13526f3624
commit 060859cc68
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gallery_dl/extractor/mangoxo.py
View File

@@ -28,7 +28,7 @@ class MangoxoAlbumExtractor(MangoxoBase, Extractor):
filename_fmt = "{album[id]}_{num:>03}.{extension}" filename_fmt = "{album[id]}_{num:>03}.{extension}"
directory_fmt = ("{category}", "{channel[name]}", "{album[name]}") directory_fmt = ("{category}", "{channel[name]}", "{album[name]}")
archive_fmt = "{album[id]}_{num}" archive_fmt = "{album[id]}_{num}"
pattern = r"(?:https://)?(?:www\.)?mangoxo\.com/album/(\w+)" pattern = r"(?:https?://)?(?:www\.)?mangoxo\.com/album/(\w+)"
test = ("https://www.mangoxo.com/album/lzVOv1Q9", { test = ("https://www.mangoxo.com/album/lzVOv1Q9", {
"url": "ad921fe62663b06e7d73997f7d00646cab7bdd0d", "url": "ad921fe62663b06e7d73997f7d00646cab7bdd0d",
"keyword": { "keyword": {
@@ -105,7 +105,7 @@ class MangoxoAlbumExtractor(MangoxoBase, Extractor):
class MangoxoChannelExtractor(MangoxoBase, Extractor): class MangoxoChannelExtractor(MangoxoBase, Extractor):
"""Extractor for all albums on a mangoxo channel""" """Extractor for all albums on a mangoxo channel"""
subcategory = "channel" subcategory = "channel"
pattern = r"(?:https://)?(?:www\.)?mangoxo\.com/channel/(\w+)" pattern = r"(?:https?://)?(?:www\.)?mangoxo\.com/channel/(\w+)"
test = ("https://www.mangoxo.com/channel/QeYKRkO0", { test = ("https://www.mangoxo.com/channel/QeYKRkO0", {
"pattern": MangoxoAlbumExtractor.pattern, "pattern": MangoxoAlbumExtractor.pattern,
"range": "1-30", "range": "1-30",

2
gallery_dl/extractor/wikiart.py
View File

@@ -11,7 +11,7 @@
from .common import Extractor, Message from .common import Extractor, Message
from .. import text from .. import text
BASE_PATTERN = r"(?:https://)?(?:www\.)?wikiart\.org/([a-z]+)" BASE_PATTERN = r"(?:https?://)?(?:www\.)?wikiart\.org/([a-z]+)"
class WikiartExtractor(Extractor): class WikiartExtractor(Extractor):

4
gallery_dl/extractor/yaplog.py
View File

@@ -76,7 +76,7 @@ class YaplogExtractor(AsynchronousMixin, Extractor):
class YaplogUserExtractor(YaplogExtractor): class YaplogUserExtractor(YaplogExtractor):
"""Extractor for a user's blog on yaplog.jp""" """Extractor for a user's blog on yaplog.jp"""
subcategory = "user" subcategory = "user"
pattern = r"(?:https://)?(?:www\.)?yaplog\.jp/(\w+)/?(?:$|[?&#])" pattern = r"(?:https?://)?(?:www\.)?yaplog\.jp/(\w+)/?(?:$|[?&#])"
test = ("https://yaplog.jp/omitakashi3", { test = ("https://yaplog.jp/omitakashi3", {
"pattern": r"https://img.yaplog.jp/img/18/pc/o/m/i/omitakashi3/0/", "pattern": r"https://img.yaplog.jp/img/18/pc/o/m/i/omitakashi3/0/",
"count": ">= 2", "count": ">= 2",
@@ -92,7 +92,7 @@ class YaplogUserExtractor(YaplogExtractor):
class YaplogPostExtractor(YaplogExtractor): class YaplogPostExtractor(YaplogExtractor):
"""Extractor for images from a blog post on yaplog.jp""" """Extractor for images from a blog post on yaplog.jp"""
subcategory = "post" subcategory = "post"
pattern = (r"(?:https://)?(?:www\.)?yaplog\.jp" pattern = (r"(?:https?://)?(?:www\.)?yaplog\.jp"
r"/(\w+)/(?:archive|image)/(\d+)") r"/(\w+)/(?:archive|image)/(\d+)")
test = ("https://yaplog.jp/imamiami0726/image/1299", { test = ("https://yaplog.jp/imamiami0726/image/1299", {
"url": "896cae20fa718735a57e723c48544e830ff31345", "url": "896cae20fa718735a57e723c48544e830ff31345",