matching "/video/x3z49k?playlist=xv4bw" as a video instead of a playlist

This commit is contained in:
Mozi 2024-08-30 18:02:52 +00:00
parent 856239baf3
commit c61db5e643
1 changed files with 7 additions and 7 deletions

View File

@ -108,9 +108,9 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
(?:
video/|
swf(?:/(?!video)|/video/)|
player(?:(?:/\w+)?\.html)?(?:\?video=|/)
player(?:/\w+)?\.html\?(?:video|playlist)=
)
(?P<id>[^/?_&#]+)(?:.+?\bplaylist=(?P<playlist_id>x[0-9a-z]+))?
(?P<id>[^/?_&#]+)
'''
IE_NAME = 'dailymotion'
_EMBED_REGEX = [r'<(?:(?:embed|iframe)[^>]+?src=|input[^>]+id=[\'"]dmcloudUrlEmissionSelect[\'"][^>]+value=)(["\'])(?P<url>(?:https?:)?//(?:www\.)?dailymotion\.com/(?:embed|swf)/video/.+?)\1']
@ -285,13 +285,13 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
def _real_extract(self, url):
url, smuggled_data = unsmuggle_url(url)
video_id, playlist_id = self._match_valid_url(url).groups()
video_id = self._match_id(url)
if playlist_id:
if self._yes_playlist(playlist_id, video_id):
if 'playlist=' in url:
if self._yes_playlist(video_id, video_id):
return self.url_result(
'http://www.dailymotion.com/playlist/' + playlist_id,
'DailymotionPlaylist', playlist_id)
'http://www.dailymotion.com/playlist/' + video_id,
'DailymotionPlaylist', video_id)
password = self.get_param('videopassword')
media = self._call_api(