xZero707/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-23 19:35:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

[carambatv] Fix extraction

Browse Source 
The video requested in #9815 now has videomore embeds.
This commit is contained in:
Yen Chi Hsuan 2016-10-14 23:43:18 +08:00
parent 146969e05b
commit 62a0b86e4f
No known key found for this signature in database
GPG Key ID: 3FDDD575826C5C30
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
version <unreleased> version <unreleased>
Extractors Extractors
* [charambatv] Fix extraction
* [canalplus] Fix extraction for some videos * [canalplus] Fix extraction for some videos
* [cbsinteractive] Fix extraction for cnet.com * [cbsinteractive] Fix extraction for cnet.com
* [parliamentliveuk] Lower case URLs are now recognized (#10912) * [parliamentliveuk] Lower case URLs are now recognized (#10912)

24
youtube_dl/extractor/carambatv.py
View File

@ -9,6 +9,8 @@ from ..utils import (
try_get, try_get,
) )
from .videomore import VideomoreIE
class CarambaTVIE(InfoExtractor): class CarambaTVIE(InfoExtractor):
_VALID_URL = r'(?:carambatv:|https?://video1\.carambatv\.ru/v/)(?P<id>\d+)' _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>[^/?#&]+)' _VALID_URL = r'https?://carambatv\.ru/(?:[^/]+/)+(?P<id>[^/?#&]+)'
_TEST = { _TEST = {
'url': 'http://carambatv.ru/movie/bad-comedian/razborka-v-manile/', 'url': 'http://carambatv.ru/movie/bad-comedian/razborka-v-manile/',
'md5': '', 'md5': 'a49fb0ec2ad66503eeb46aac237d3c86',
'info_dict': { 'info_dict': {
'id': '191910501', 'id': '475222',
'ext': 'mp4', 'ext': 'flv',
'title': '[BadComedian] - Разборка в Маниле (Абсолютный обзор)', 'title': '[BadComedian] - Разборка в Маниле (Абсолютный обзор)',
'thumbnail': 're:^https?://.*\.jpg$', 'thumbnail': 're:^https?://.*\.jpg',
'duration': 2678.31, # duration reported by videomore is incorrect
'duration': int,
}, },
'add_ie': [VideomoreIE.ie_key()],
} }
def _real_extract(self, url): def _real_extract(self, url):
@ -77,6 +81,16 @@ class CarambaTVPageIE(InfoExtractor):
webpage = self._download_webpage(url, video_id) 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) video_url = self._og_search_property('video:iframe', webpage, default=None)
if not video_url: if not video_url: