aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLéo El Amri <leo@superlel.me>2019-07-29 19:03:19 +0200
committerLéo El Amri <leo@superlel.me>2019-07-29 19:03:19 +0200
commitd28026d934453e423344dfd363a9909c520ef0b5 (patch)
treec8607fff24b73cc09227fe7282ea4e6cdd8464db
parentca7e9e1cd1704b81562962f135464dbaefd22699 (diff)
downloadhypervideo-pre-d28026d934453e423344dfd363a9909c520ef0b5.tar.lz
hypervideo-pre-d28026d934453e423344dfd363a9909c520ef0b5.tar.xz
hypervideo-pre-d28026d934453e423344dfd363a9909c520ef0b5.zip
[twitch] Modified _VALID_URL for TwitchAllVideosIE
Reverted the modification of youtube_dl/extractor/extractors.py since TwitchAllVideosIE now only matches on URLs with filter=all or without any parameters
-rw-r--r--youtube_dl/extractor/extractors.py2
-rw-r--r--youtube_dl/extractor/twitch.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 2b26cb347..555fadfaf 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -1235,10 +1235,10 @@ from .twitch import (
TwitchChapterIE,
TwitchVodIE,
TwitchProfileIE,
+ TwitchAllVideosIE,
TwitchUploadsIE,
TwitchPastBroadcastsIE,
TwitchHighlightsIE,
- TwitchAllVideosIE,
TwitchStreamIE,
TwitchClipsIE,
)
diff --git a/youtube_dl/extractor/twitch.py b/youtube_dl/extractor/twitch.py
index 6a1015ce5..ef823220c 100644
--- a/youtube_dl/extractor/twitch.py
+++ b/youtube_dl/extractor/twitch.py
@@ -438,7 +438,7 @@ class TwitchVideosBaseIE(TwitchPlaylistBaseIE):
class TwitchAllVideosIE(TwitchVideosBaseIE):
IE_NAME = 'twitch:videos:all'
- _VALID_URL = '%s(?:/?(?:%s)|[^/?]+?/?)?' % (
+ _VALID_URL = '%s/?(?:(?:%s)|$)' % (
TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE,
TwitchVideosBaseIE._VALID_URL_VIDEOS_FILTERS % 'all'
)