From d28026d934453e423344dfd363a9909c520ef0b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20El=20Amri?= Date: Mon, 29 Jul 2019 19:03:19 +0200 Subject: [PATCH] [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 --- youtube_dl/extractor/extractors.py | 2 +- youtube_dl/extractor/twitch.py | 2 +- 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' )