aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorc-basalt <117849907+c-basalt@users.noreply.github.com>2023-09-16 16:43:12 -0400
committerGitHub <noreply@github.com>2023-09-16 20:43:12 +0000
commitcebbd33b1c678149fc8f0e254db6fc0da317ea80 (patch)
tree18bdf325954778212b48f8ee6875382d5583e208
parent069cbece9dba6384f1cc5fcfc7ce562a31af42fc (diff)
[ie/twitcasting] Improve `_VALID_URL` (#8120)
Closes #7597 Authored by: c-basalt
-rw-r--r--yt_dlp/extractor/twitcasting.py13
1 files changed, 10 insertions, 3 deletions
diff --git a/yt_dlp/extractor/twitcasting.py b/yt_dlp/extractor/twitcasting.py
index dff353a4f..3890d5d8f 100644
--- a/yt_dlp/extractor/twitcasting.py
+++ b/yt_dlp/extractor/twitcasting.py
@@ -22,7 +22,7 @@ from ..utils import (
class TwitCastingIE(InfoExtractor):
- _VALID_URL = r'https?://(?:[^/]+\.)?twitcasting\.tv/(?P<uploader_id>[^/]+)/(?:movie|twplayer)/(?P<id>\d+)'
+ _VALID_URL = r'https?://(?:[^/?#]+\.)?twitcasting\.tv/(?P<uploader_id>[^/?#]+)/(?:movie|twplayer)/(?P<id>\d+)'
_M3U8_HEADERS = {
'Origin': 'https://twitcasting.tv',
'Referer': 'https://twitcasting.tv/',
@@ -231,7 +231,7 @@ class TwitCastingIE(InfoExtractor):
class TwitCastingLiveIE(InfoExtractor):
- _VALID_URL = r'https?://(?:[^/]+\.)?twitcasting\.tv/(?P<id>[^/]+)/?(?:[#?]|$)'
+ _VALID_URL = r'https?://(?:[^/?#]+\.)?twitcasting\.tv/(?P<id>[^/?#]+)/?(?:[#?]|$)'
_TESTS = [{
'url': 'https://twitcasting.tv/ivetesangalo',
'only_matching': True,
@@ -265,8 +265,15 @@ class TwitCastingLiveIE(InfoExtractor):
class TwitCastingUserIE(InfoExtractor):
- _VALID_URL = r'https?://(?:[^/]+\.)?twitcasting\.tv/(?P<id>[^/]+)/show/?(?:[#?]|$)'
+ _VALID_URL = r'https?://(?:[^/?#]+\.)?twitcasting\.tv/(?P<id>[^/?#]+)/(:?show|archive)/?(?:[#?]|$)'
_TESTS = [{
+ 'url': 'https://twitcasting.tv/natsuiromatsuri/archive/',
+ 'info_dict': {
+ 'id': 'natsuiromatsuri',
+ 'title': 'natsuiromatsuri - Live History',
+ },
+ 'playlist_mincount': 235,
+ }, {
'url': 'https://twitcasting.tv/noriyukicas/show',
'only_matching': True,
}]