Madeorsk
/
youtube-dl
mirror of https://codeberg.org/polarisfm/youtube-dl
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge 3513f7f95b into 4eda10499e

This commit is contained in:
Vidar Flesjø 2020-10-18 01:24:23 +02:00 committed by GitHub
parent 4eda10499e 3513f7f95b
commit cca5ab8e37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
youtube_dl/extractor/nuvid.py
View File

@ -25,29 +25,29 @@ class NuvidIE(InfoExtractor):
def _real_extract(self, url):
video_id = self._match_id(url)
page_url = 'http://m.nuvid.com/video/%s' % video_id
webpage = self._download_webpage(
page_url, video_id, 'Downloading video page')
page_url = 'https://m.nuvid.com/video/%s' % video_id
# When dwnld_speed exists and has a value larger than the MP4 file's
# bitrate, Nuvid returns the MP4 URL
# It's unit is 100bytes/millisecond, see mobile-nuvid-min.js for the algorithm
self._set_cookie('nuvid.com', 'dwnld_speed', '10.0')
mp4_webpage = self._download_webpage(
page_url, video_id, 'Downloading video page for MP4 format')
webpage = self._download_webpage(
page_url, video_id, 'Downloading video page')
video_hash_re = r'(?s)<(?:video|audio).+data-video_hash="(?P<video_hash>[^"]+)[^>]*(?:>)',
hash_time_re = r'(?s)<(?:video|audio).+data-hash_time="(?P<hash_time>[^"]+)[^>]*(?:>)',
video_hash = self._html_search_regex(video_hash_re, webpage, 'video_hash')
hash_time = self._html_search_regex(hash_time_re, webpage, 'hash_time')
query = {'video_hash': video_hash, 'hash_time': hash_time, 'video_id': video_id}
player_source = self._download_json('https://m.nuvid.com/player_config', video_id, query=query)
mp4_video_url = player_source['source']
html5_video_re = r'(?s)<(?:video|audio)[^<]*(?:>.*?<source[^>]*)?\s+src=["\'](.*?)["\']',
video_url = self._html_search_regex(html5_video_re, webpage, video_id)
mp4_video_url = self._html_search_regex(html5_video_re, mp4_webpage, video_id)
formats = [{
'url': video_url,
'url': mp4_video_url
}]
if mp4_video_url != video_url:
formats.append({
'url': mp4_video_url,
})
title = self._html_search_regex(
[r'<span title="([^"]+)">',
[r'<div class="[^"]+" title="([^"]+)" id="video_area">',
r'<div class="thumb-holder video">\s*<h5[^>]*>([^<]+)</h5>',
r'<span[^>]+class="title_thumb">([^<]+)</span>'], webpage, 'title').strip()
thumbnails = [