DuckDuckWhale/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-12-16 14:36:47 +00:00
Code Issues Releases Wiki Activity

Further small improvements

Browse Source
This commit is contained in:
dirkf 2024-11-29 14:17:10 +00:00 committed by GitHub
parent ab9ad567d8
commit 98e6231a25
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
youtube_dl/extractor/doodstream.py
View File

@ -78,16 +78,16 @@ class DoodStreamIE(InfoExtractor):
return self._html_search_regex(r'<title\b[^>]*>([^<]+?)(?:[|-]\s+DoodStream\s*)?</title', html, 'title', fatal=fatal) return self._html_search_regex(r'<title\b[^>]*>([^<]+?)(?:[|-]\s+DoodStream\s*)?</title', html, 'title', fatal=fatal)
title = get_title(webpage) title = get_title(webpage)
if title == 'Video not found': if title == 'Video not found' or (
title == '' and 'Not Found' == self._html_search_regex(r'<h1\b[^>]*>([^<]+?)</h1', webpage, 'heading1', default=None)):
raise ExtractorError(title, expected=True) raise ExtractorError(title, expected=True)
token = self._html_search_regex(r'''[?&]token=([a-z0-9]+)[&']''', webpage, 'token')
headers.update({ pass_md5, token = self._search_regex(
# 'User-Agent': 'Mozilla/5.0', # (Windows NT 6.1; WOW64; rv:53.0) Gecko/20100101 Firefox/66.0', r'["\']/(?P<pm>pass_md5/[\da-f-]+/(?P<tok>[\da-z]+))', webpage, 'tokens',
'referer': url group=('pm', 'tok'))
}) headers = {
'Referer': url,
pass_md5 = self._html_search_regex(r'(/pass_md5.*?)\'', webpage, 'pass_md5') }
# construct the media link # construct the media link
final_url = self._download_webpage( final_url = self._download_webpage(
'https://%s/%s' % (host, pass_md5), video_id, headers={ 'https://%s/%s' % (host, pass_md5), video_id, headers={
@ -100,6 +100,7 @@ class DoodStreamIE(InfoExtractor):
'expiry': int(time_time() * 1000), 'expiry': int(time_time() * 1000),
}) })
# get additional metadata
thumb = next(filter(None, (url_or_none(self._html_search_meta(x, webpage, default=None)) thumb = next(filter(None, (url_or_none(self._html_search_meta(x, webpage, default=None))
for x in ('og:image', 'twitter:image'))), None) for x in ('og:image', 'twitter:image'))), None)
description = self._html_search_meta( description = self._html_search_meta(