projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[drtv] Add support for new URL schema (closes #23059)
[youtube-dl]
/
youtube_dl
/
extractor
/
carambatv.py
diff --git
a/youtube_dl/extractor/carambatv.py
b/youtube_dl/extractor/carambatv.py
index 66c0f900a402664653a846e9b39fc44c1da2853e..b57b86af7e6b05527e102974b6533b4538f5d366 100644
(file)
--- a/
youtube_dl/extractor/carambatv.py
+++ b/
youtube_dl/extractor/carambatv.py
@@
-21,7
+21,7
@@
class CarambaTVIE(InfoExtractor):
'id': '191910501',
'ext': 'mp4',
'title': '[BadComedian] - Разборка в Маниле (Абсолютный обзор)',
'id': '191910501',
'ext': 'mp4',
'title': '[BadComedian] - Разборка в Маниле (Абсолютный обзор)',
- 'thumbnail': 're:^https?://.*\.jpg',
+ 'thumbnail':
r
're:^https?://.*\.jpg',
'duration': 2678.31,
},
}, {
'duration': 2678.31,
},
}, {
@@
-69,7
+69,7
@@
class CarambaTVPageIE(InfoExtractor):
'id': '475222',
'ext': 'flv',
'title': '[BadComedian] - Разборка в Маниле (Абсолютный обзор)',
'id': '475222',
'ext': 'flv',
'title': '[BadComedian] - Разборка в Маниле (Абсолютный обзор)',
- 'thumbnail': 're:^https?://.*\.jpg',
+ 'thumbnail':
r
're:^https?://.*\.jpg',
# duration reported by videomore is incorrect
'duration': int,
},
# duration reported by videomore is incorrect
'duration': int,
},
@@
-82,6
+82,12
@@
class CarambaTVPageIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
videomore_url = VideomoreIE._extract_url(webpage)
webpage = self._download_webpage(url, video_id)
videomore_url = VideomoreIE._extract_url(webpage)
+ if not videomore_url:
+ videomore_id = self._search_regex(
+ r'getVMCode\s*\(\s*["\']?(\d+)', webpage, 'videomore id',
+ default=None)
+ if videomore_id:
+ videomore_url = 'videomore:%s' % videomore_id
if videomore_url:
title = self._og_search_title(webpage)
return {
if videomore_url:
title = self._og_search_title(webpage)
return {