aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/carambatv.py
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2016-10-14 23:43:18 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2016-10-14 23:43:18 +0800
commit62a0b86e4f1aa3f0b4debdd4939c14f8fb8b5bef (patch)
tree5dc9bdeb3136d063580f702ef23e4d34566c279c /youtube_dl/extractor/carambatv.py
parent146969e05bc2e2774aa96c62030cdb85ca5c7667 (diff)
[carambatv] Fix extraction
The video requested in #9815 now has videomore embeds.
Diffstat (limited to 'youtube_dl/extractor/carambatv.py')
-rw-r--r--youtube_dl/extractor/carambatv.py24
1 files changed, 19 insertions, 5 deletions
diff --git a/youtube_dl/extractor/carambatv.py b/youtube_dl/extractor/carambatv.py
index 5797fb951..66c0f900a 100644
--- a/youtube_dl/extractor/carambatv.py
+++ b/youtube_dl/extractor/carambatv.py
@@ -9,6 +9,8 @@ from ..utils import (
try_get,
)
+from .videomore import VideomoreIE
+
class CarambaTVIE(InfoExtractor):
_VALID_URL = r'(?:carambatv:|https?://video1\.carambatv\.ru/v/)(?P<id>\d+)'
@@ -62,14 +64,16 @@ class CarambaTVPageIE(InfoExtractor):
_VALID_URL = r'https?://carambatv\.ru/(?:[^/]+/)+(?P<id>[^/?#&]+)'
_TEST = {
'url': 'http://carambatv.ru/movie/bad-comedian/razborka-v-manile/',
- 'md5': '',
+ 'md5': 'a49fb0ec2ad66503eeb46aac237d3c86',
'info_dict': {
- 'id': '191910501',
- 'ext': 'mp4',
+ 'id': '475222',
+ 'ext': 'flv',
'title': '[BadComedian] - Разборка в Маниле (Абсолютный обзор)',
- 'thumbnail': 're:^https?://.*\.jpg$',
- 'duration': 2678.31,
+ 'thumbnail': 're:^https?://.*\.jpg',
+ # duration reported by videomore is incorrect
+ 'duration': int,
},
+ 'add_ie': [VideomoreIE.ie_key()],
}
def _real_extract(self, url):
@@ -77,6 +81,16 @@ class CarambaTVPageIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
+ videomore_url = VideomoreIE._extract_url(webpage)
+ if videomore_url:
+ title = self._og_search_title(webpage)
+ return {
+ '_type': 'url_transparent',
+ 'url': videomore_url,
+ 'ie_key': VideomoreIE.ie_key(),
+ 'title': title,
+ }
+
video_url = self._og_search_property('video:iframe', webpage, default=None)
if not video_url: