mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-09-01 13:05:11 +02:00
Merge 9f73209cf8
into e1b3fa242c
This commit is contained in:
commit
bd09673148
@ -637,7 +637,12 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
|
|||||||
|
|
||||||
class CrunchyrollShowPlaylistIE(CrunchyrollBaseIE):
|
class CrunchyrollShowPlaylistIE(CrunchyrollBaseIE):
|
||||||
IE_NAME = 'crunchyroll:playlist'
|
IE_NAME = 'crunchyroll:playlist'
|
||||||
_VALID_URL = r'https?://(?:(?P<prefix>www|m)\.)?(?P<url>crunchyroll\.com/(?!(?:news|anime-news|library|forum|launchcalendar|lineup|store|comics|freetrial|login|media-\d+))(?P<id>[\w\-]+))/?(?:\?|$)'
|
_VALID_URL = r"""(?x)^
|
||||||
|
https?://(?:(?P<prefix>www|m)\.)?(?P<url>crunchyroll\.com/ # protocol, prefix, domain
|
||||||
|
(?:(?:en-gb|es|es-es|pt-br|pt-pt|fr|de|ar|it|ru)/)? # optional language component
|
||||||
|
(?!(?:news|anime-news|library|forum|launchcalendar|lineup|store|comics|freetrial|login|media-\d+)) # exclude special pages
|
||||||
|
(?P<id>[\w\-]+))/?(?:\?|$)
|
||||||
|
"""
|
||||||
|
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'http://www.crunchyroll.com/a-bridge-to-the-starry-skies-hoshizora-e-kakaru-hashi',
|
'url': 'http://www.crunchyroll.com/a-bridge-to-the-starry-skies-hoshizora-e-kakaru-hashi',
|
||||||
@ -646,6 +651,14 @@ class CrunchyrollShowPlaylistIE(CrunchyrollBaseIE):
|
|||||||
'title': 'A Bridge to the Starry Skies - Hoshizora e Kakaru Hashi'
|
'title': 'A Bridge to the Starry Skies - Hoshizora e Kakaru Hashi'
|
||||||
},
|
},
|
||||||
'playlist_count': 13,
|
'playlist_count': 13,
|
||||||
|
}, {
|
||||||
|
# non-US language
|
||||||
|
'url': 'https://www.crunchyroll.com/en-gb/a-bridge-to-the-starry-skies-hoshizora-e-kakaru-hashi',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'a-bridge-to-the-starry-skies-hoshizora-e-kakaru-hashi',
|
||||||
|
'title': 'A Bridge to the Starry Skies - Hoshizora e Kakaru Hashi'
|
||||||
|
},
|
||||||
|
'playlist_count': 13,
|
||||||
}, {
|
}, {
|
||||||
# geo-restricted (US), 18+ maturity wall, non-premium available
|
# geo-restricted (US), 18+ maturity wall, non-premium available
|
||||||
'url': 'http://www.crunchyroll.com/cosplay-complex-ova',
|
'url': 'http://www.crunchyroll.com/cosplay-complex-ova',
|
||||||
|
Loading…
Reference in New Issue
Block a user