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

fix/improve some regular expressions

Browse Source
This commit is contained in:
Mike Fährmann
2017-10-09 22:37:50 +02:00
parent 832b8b76ac
commit 68a0a7579c
8 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gallery_dl/extractor/mangapanda.py
View File

@@ -19,7 +19,7 @@ class MangapandaBase():
class MangapandaMangaExtractor(MangapandaBase, MangareaderMangaExtractor):
"""Extractor for manga from mangapanda.com"""
pattern = [r"(?:https?://)?((?:www\.)?mangapanda\.com/[^/]+)/?$"]
pattern = [r"(?:https?://)?((?:www\.)?mangapanda\.com/[^/?&#]+)/?$"]
test = [("http://www.mangapanda.com/mushishi", {
"url": "50a1ba730b85426b904da256c80f68ba6a8a2566",
"keyword": "031b3ea085921c552de017ecbb9b906e462229c9",
@@ -29,9 +29,9 @@ class MangapandaMangaExtractor(MangapandaBase, MangareaderMangaExtractor):
class MangapandaChapterExtractor(MangapandaBase, MangareaderChapterExtractor):
"""Extractor for manga-chapters from mangapanda.com"""
pattern = [
(r"(?:https?://)?(?:www\.)?mangapanda\.com((/[^/]+)/(\d+))"),
(r"(?:https?://)?(?:www\.)?mangapanda\.com((/[^/?&#]+)/(\d+))"),
(r"(?:https?://)?(?:www\.)?mangapanda\.com"
r"(/\d+-\d+-\d+(/[^/]+)/chapter-(\d+).html)"),
r"(/\d+-\d+-\d+(/[^/]+)/chapter-(\d+)\.html)"),
]
test = [("http://www.mangapanda.com/red-storm/2", {
"url": "4bf4ddf6c50105ec8a37675495ab80c46608275d",