[youtube] prioritize information from YoutubeIE for playlist entries(closes #28619 , closes #28636 )

[extractor/common] fix _get_cookies method for python 2(#20673 , #23256 , #20326 , closes #28640 )
2024-12-18 14:41:59 +00:00 · 2021-04-03 08:23:35 +01:00 · 2021-04-03 07:54:16 +01:00
2 changed files with 5 additions and 2 deletions
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@ -2899,7 +2899,10 @@ class InfoExtractor(object):
        """ Return a compat_cookies.SimpleCookie with the cookies for the url """
        req = sanitized_Request(url)
        self._downloader.cookiejar.add_cookie_header(req)
-        return compat_cookies.SimpleCookie(req.get_header('Cookie'))
+        cookie = req.get_header('Cookie')
+        if cookie and sys.version_info[0] == 2:
+            cookie = str(cookie)
+        return compat_cookies.SimpleCookie(cookie)

    def _apply_first_set_cookie_header(self, url_handle, cookie):
        """
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@ -329,7 +329,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
            (lambda x: x['ownerText']['runs'][0]['text'],
             lambda x: x['shortBylineText']['runs'][0]['text']), compat_str)
        return {
-            '_type': 'url_transparent',
+            '_type': 'url',
            'ie_key': YoutubeIE.ie_key(),
            'id': video_id,
            'url': video_id,
Author	SHA1	Message	Date
Remita Amine	654b4f4ff2	[youtube] prioritize information from YoutubeIE for playlist entries(closes #28619 , closes #28636 )	2021-04-03 08:23:35 +01:00
Remita Amine	1df2596f81	[extractor/common] fix _get_cookies method for python 2(#20673 , #23256 , #20326 , closes #28640 )	2021-04-03 07:54:16 +01:00