From 0c6a9bb5d266fd8613fdd8195ad3e74902b93882 Mon Sep 17 00:00:00 2001 From: Chris Caruso Date: Fri, 31 Mar 2023 17:13:27 -0700 Subject: [PATCH 1/4] youku error message fix --- yt_dlp/extractor/youku.py | 63 ++------------------------------------- 1 file changed, 2 insertions(+), 61 deletions(-) diff --git a/yt_dlp/extractor/youku.py b/yt_dlp/extractor/youku.py index 404f196f46f..14298f339b1 100644 --- a/yt_dlp/extractor/youku.py +++ b/yt_dlp/extractor/youku.py @@ -6,6 +6,7 @@ from .common import InfoExtractor from ..utils import ( ExtractorError, + clean_html, get_element_by_class, js_to_json, str_or_none, @@ -26,66 +27,6 @@ class YoukuIE(InfoExtractor): ''' _TESTS = [{ - # MD5 is unstable - 'url': 'http://v.youku.com/v_show/id_XMTc1ODE5Njcy.html', - 'info_dict': { - 'id': 'XMTc1ODE5Njcy', - 'title': '★Smile﹗♡ Git Fresh -Booty Music舞蹈.', - 'ext': 'mp4', - 'duration': 74.73, - 'thumbnail': r're:^https?://.*', - 'uploader': '。躲猫猫、', - 'uploader_id': '36017967', - 'uploader_url': 'http://i.youku.com/u/UMTQ0MDcxODY4', - 'tags': list, - } - }, { - 'url': 'http://player.youku.com/player.php/sid/XNDgyMDQ2NTQw/v.swf', - 'only_matching': True, - }, { - 'url': 'http://v.youku.com/v_show/id_XODgxNjg1Mzk2_ev_1.html', - 'info_dict': { - 'id': 'XODgxNjg1Mzk2', - 'ext': 'mp4', - 'title': '武媚娘传奇 85', - 'duration': 1999.61, - 'thumbnail': r're:^https?://.*', - 'uploader': '疯狂豆花', - 'uploader_id': '62583473', - 'uploader_url': 'http://i.youku.com/u/UMjUwMzMzODky', - 'tags': list, - }, - }, { - 'url': 'http://v.youku.com/v_show/id_XMTI1OTczNDM5Mg==.html', - 'info_dict': { - 'id': 'XMTI1OTczNDM5Mg', - 'ext': 'mp4', - 'title': '花千骨 04', - 'duration': 2363, - 'thumbnail': r're:^https?://.*', - 'uploader': '放剧场-花千骨', - 'uploader_id': '772849359', - 'uploader_url': 'http://i.youku.com/u/UMzA5MTM5NzQzNg==', - 'tags': list, - }, - }, { - 'url': 'http://v.youku.com/v_show/id_XNjA1NzA2Njgw.html', - 'note': 'Video protected with password', - 'info_dict': { - 'id': 'XNjA1NzA2Njgw', - 'ext': 'mp4', - 'title': '邢義田复旦讲座之想象中的胡人—从“左衽孔子”说起', - 'duration': 7264.5, - 'thumbnail': r're:^https?://.*', - 'uploader': 'FoxJin1006', - 'uploader_id': '322014285', - 'uploader_url': 'http://i.youku.com/u/UMTI4ODA1NzE0MA==', - 'tags': list, - }, - 'params': { - 'videopassword': '100600', - }, - }, { # /play/get.json contains streams with "channel_type":"tail" 'url': 'http://v.youku.com/v_show/id_XOTUxMzg4NDMy.html', 'info_dict': { @@ -192,7 +133,7 @@ def _real_extract(self, url): else: msg = 'Youku server reported error %i' % error.get('code') if error_note is not None: - msg += ': ' + error_note + msg += ': ' + clean_html(error_note) raise ExtractorError(msg) # get video title From ec93192423ef9056fef4cc4bc0023d20f5b902bc Mon Sep 17 00:00:00 2001 From: Chris Caruso Date: Fri, 31 Mar 2023 17:17:41 -0700 Subject: [PATCH 2/4] readded matching test --- yt_dlp/extractor/youku.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/yt_dlp/extractor/youku.py b/yt_dlp/extractor/youku.py index 14298f339b1..2d1c26ac37f 100644 --- a/yt_dlp/extractor/youku.py +++ b/yt_dlp/extractor/youku.py @@ -40,6 +40,9 @@ class YoukuIE(InfoExtractor): 'uploader_url': 'https://www.youku.com/profile/index/?uid=UMTUzODYyNDg0', 'tags': list, }, + }, { + 'url': 'http://player.youku.com/player.php/sid/XNDgyMDQ2NTQw/v.swf', + 'only_matching': True, }, { 'url': 'https://v.youku.com/v_show/id_XNTA2NTA0MjA1Mg==.html', 'info_dict': { From f72c0417250fd23b71662b6c1a9eec20a69099e1 Mon Sep 17 00:00:00 2001 From: Chris Caruso Date: Sat, 1 Apr 2023 18:42:59 -0700 Subject: [PATCH 3/4] re-added URL+pw test --- yt_dlp/extractor/youku.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/yt_dlp/extractor/youku.py b/yt_dlp/extractor/youku.py index 2d1c26ac37f..d5413d6e040 100644 --- a/yt_dlp/extractor/youku.py +++ b/yt_dlp/extractor/youku.py @@ -27,6 +27,24 @@ class YoukuIE(InfoExtractor): ''' _TESTS = [{ + 'url': 'http://v.youku.com/v_show/id_XNjA1NzA2Njgw.html', + 'note': 'Video protected with password', + 'info_dict': { + 'id': 'XNjA1NzA2Njgw', + 'ext': 'mp4', + 'title': '邢義田复旦讲座之想象中的胡人—从“左衽孔子”说起', + 'duration': 7264.5, + 'thumbnail': r're:^https?://.*', + 'uploader': 'FoxJin1006', + 'uploader_id': '322014285', + 'uploader_url': 'http://i.youku.com/u/UMTI4ODA1NzE0MA==', + 'tags': list, + 'skip': '404', + }, + 'params': { + 'videopassword': '100600', + }, + }, { # /play/get.json contains streams with "channel_type":"tail" 'url': 'http://v.youku.com/v_show/id_XOTUxMzg4NDMy.html', 'info_dict': { From bac4bc23e435dca789e14f2fc754024425656b59 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Tue, 11 Apr 2023 17:12:53 +0530 Subject: [PATCH 4/4] cleanup --- yt_dlp/extractor/youku.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yt_dlp/extractor/youku.py b/yt_dlp/extractor/youku.py index d5413d6e040..7ecd9f18392 100644 --- a/yt_dlp/extractor/youku.py +++ b/yt_dlp/extractor/youku.py @@ -27,6 +27,9 @@ class YoukuIE(InfoExtractor): ''' _TESTS = [{ + 'url': 'http://player.youku.com/player.php/sid/XNDgyMDQ2NTQw/v.swf', + 'only_matching': True, + }, { 'url': 'http://v.youku.com/v_show/id_XNjA1NzA2Njgw.html', 'note': 'Video protected with password', 'info_dict': { @@ -58,9 +61,6 @@ class YoukuIE(InfoExtractor): 'uploader_url': 'https://www.youku.com/profile/index/?uid=UMTUzODYyNDg0', 'tags': list, }, - }, { - 'url': 'http://player.youku.com/player.php/sid/XNDgyMDQ2NTQw/v.swf', - 'only_matching': True, }, { 'url': 'https://v.youku.com/v_show/id_XNTA2NTA0MjA1Mg==.html', 'info_dict': {