From 2417bf0daadca2c90278b4cc3ce2405a0a4f9d7c Mon Sep 17 00:00:00 2001 From: sichuan-pepper Date: Mon, 29 Oct 2018 04:11:32 +0900 Subject: [PATCH] [Twitcasting] Implemented requested changes. --- youtube_dl/extractor/twitcasting.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/youtube_dl/extractor/twitcasting.py b/youtube_dl/extractor/twitcasting.py index f7b078945..f35ed412f 100644 --- a/youtube_dl/extractor/twitcasting.py +++ b/youtube_dl/extractor/twitcasting.py @@ -7,7 +7,7 @@ import re class TwitcastingIE(InfoExtractor): - _VALID_URL = r'https?://(?:[^\/]+)?\.?twitcasting\.tv/(?P[^\/]+)/movie/(?P[0-9]+)$' + _VALID_URL = r'https?://(?:www|ssl|en|pt|es|ja|ko\.)?twitcasting\.tv/(?P[^\/]+)/movie/(?P[0-9]+)' _TEST = { 'url': 'https://twitcasting.tv/ivetesangalo/movie/2357609', 'md5': '745243cad58c4681dc752490f7540d7f', @@ -28,12 +28,12 @@ class TwitcastingIE(InfoExtractor): webpage = self._download_webpage(url, video_id) - for m in re.finditer(r'(["\'])(?Phttp.+?\.m3u8.*?)\1', webpage): - formats = self._extract_m3u8_formats(m.group('url'), video_id, ext='mp4') + playlist_url = self._html_search_regex(r'(["\'])(?Phttp.+?\.m3u8.*?)\1', webpage, name='playlist url', group='url') + formats = self._extract_m3u8_formats(playlist_url.group('url'), video_id, ext='mp4') thumbnail = self._og_search_thumbnail(webpage) title = self._html_search_meta('twitter:title', webpage) description = self._og_search_description(webpage) or self._html_search_meta('twitter:description', webpage) - return({ + return{ 'id': video_id, 'url': url, 'title': title, @@ -41,4 +41,4 @@ class TwitcastingIE(InfoExtractor): 'thumbnail': thumbnail, 'uploader_id': uploader_id, 'formats': formats, - }) + }