From f46186f960ac2a867bdb07772a379cf88d55dbe0 Mon Sep 17 00:00:00 2001 From: Avi Peretz Date: Sun, 21 Jul 2019 10:58:11 +0300 Subject: [PATCH 1/3] [ok.ru] Drop embedded videos. --- youtube_dl/extractor/odnoklassniki.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/youtube_dl/extractor/odnoklassniki.py b/youtube_dl/extractor/odnoklassniki.py index f177e4eb4..58ea3aea0 100644 --- a/youtube_dl/extractor/odnoklassniki.py +++ b/youtube_dl/extractor/odnoklassniki.py @@ -252,11 +252,14 @@ class OdnoklassnikiIE(InfoExtractor): } if provider == 'USER_YOUTUBE': + """ info.update({ '_type': 'url_transparent', 'url': movie['contentId'], }) return info + """ + raise ExtractorError('This video is embedded from YouTube.', expected=True) assert title if 'LIVE_TV' in provider: From 19d7a4f22d309782a5bc2a032d92a2dec9105c0a Mon Sep 17 00:00:00 2001 From: Avi Peretz Date: Sun, 21 Jul 2019 13:31:05 +0300 Subject: [PATCH 2/3] support embedding video. --- youtube_dl/YoutubeDL.py | 4 ++++ youtube_dl/extractor/odnoklassniki.py | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 3e832fec2..5d82508e7 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -867,6 +867,10 @@ class YoutubeDL(object): ie_key=ie_result.get('ie_key'), extra_info=extra_info) elif result_type == 'url_transparent': + if not self.params.get('download_embedded_video', True): + ie_result['embedded_url'] = ie_result['url'] + return ie_result + # Use the information from the embedding page info = self.extract_info( ie_result['url'], ie_key=ie_result.get('ie_key'), diff --git a/youtube_dl/extractor/odnoklassniki.py b/youtube_dl/extractor/odnoklassniki.py index 58ea3aea0..06de40e50 100644 --- a/youtube_dl/extractor/odnoklassniki.py +++ b/youtube_dl/extractor/odnoklassniki.py @@ -252,14 +252,12 @@ class OdnoklassnikiIE(InfoExtractor): } if provider == 'USER_YOUTUBE': - """ info.update({ '_type': 'url_transparent', - 'url': movie['contentId'], + 'url': 'https://www.youtube.com/watch?v=%s' % movie['contentId'], }) return info - """ - raise ExtractorError('This video is embedded from YouTube.', expected=True) + assert title if 'LIVE_TV' in provider: From 4c10e352246650fa78fe3e6490006ba566bfbc3f Mon Sep 17 00:00:00 2001 From: Avi Peretz Date: Sun, 21 Jul 2019 13:47:44 +0300 Subject: [PATCH 3/3] discar change. --- youtube_dl/YoutubeDL.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 5d82508e7..c72acec0a 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -867,9 +867,6 @@ class YoutubeDL(object): ie_key=ie_result.get('ie_key'), extra_info=extra_info) elif result_type == 'url_transparent': - if not self.params.get('download_embedded_video', True): - ie_result['embedded_url'] = ie_result['url'] - return ie_result # Use the information from the embedding page info = self.extract_info(