From c00c1575b6a6e85c7d994e13ae6c81315e4913e7 Mon Sep 17 00:00:00 2001 From: sxvghd Date: Mon, 17 Aug 2020 17:07:22 +0200 Subject: [PATCH] Styling changes --- youtube_dl/extractor/doodstream.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/youtube_dl/extractor/doodstream.py b/youtube_dl/extractor/doodstream.py index 38af8bee5..32719b054 100644 --- a/youtube_dl/extractor/doodstream.py +++ b/youtube_dl/extractor/doodstream.py @@ -42,17 +42,20 @@ def _real_extract(self, url): video_id = self._match_id(url) webpage = self._download_webpage(url, video_id) - title = self._og_search_title(webpage) or self._html_search_meta( - 'twitter:title', webpage, default=None) - thumb = self._og_search_thumbnail(webpage) or self._html_search_meta( - 'twitter:image', webpage, default=None) + title = self._html_search_meta(['og:title', 'twitter:title'], + webpage, default=None) + thumb = self._html_search_meta(['og:image', 'twitter:image'], + webpage, default=None) token = self._html_search_regex(r'[?&]token=([a-z0-9]+)[&\']', webpage, 'token') - description = self._og_search_description(webpage) or self._html_search_meta( - 'description', webpage, default=None) or self._html_search_meta( - 'twitter:description', webpage, default=None) + description = self._html_search_meta( + ['og:description', 'description', 'twitter:description'], + webpage, default=None) auth_url = 'https://dood.to' + self._html_search_regex( r'(/pass_md5.*?)\'', webpage, 'pass_md5') - headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:53.0) Gecko/20100101 Firefox/66.0', 'referer': url} + headers = { + 'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:53.0) Gecko/20100101 Firefox/66.0', + 'referer': url + } webpage = self._download_webpage(auth_url, video_id, headers=headers) final_url = webpage + ''.join([random.choice(string.ascii_letters + string.digits) for _ in range(10)]) + "?token=" + token + "&expiry=" + str(int(time.time() * 1000))