Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package youtube-dl for openSUSE:Factory
checked in at 2021-03-03 18:35:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/youtube-dl (Old)
and /work/SRC/openSUSE:Factory/.youtube-dl.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "youtube-dl"
Wed Mar 3 18:35:24 2021 rev:161 rq:876424 version:2021.03.03
Changes:
--------
--- /work/SRC/openSUSE:Factory/youtube-dl/python-youtube-dl.changes
2021-03-03 11:50:36.696525279 +0100
+++ /work/SRC/openSUSE:Factory/.youtube-dl.new.2378/python-youtube-dl.changes
2021-03-03 18:35:25.523398584 +0100
@@ -1,0 +2,6 @@
+Wed Mar 3 08:48:39 UTC 2021 - Jan Engelhardt <jeng...@inai.de>
+
+- Update to release 2021.03.03
+ * bbc: add support for BBC Reel videos
+
+-------------------------------------------------------------------
youtube-dl.changes: same change
Old:
----
youtube-dl-2021.03.02.tar.gz
youtube-dl-2021.03.02.tar.gz.sig
New:
----
youtube-dl-2021.03.03.tar.gz
youtube-dl-2021.03.03.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-youtube-dl.spec ++++++
--- /var/tmp/diff_new_pack.ImFBzz/_old 2021-03-03 18:35:27.007399328 +0100
+++ /var/tmp/diff_new_pack.ImFBzz/_new 2021-03-03 18:35:27.011399330 +0100
@@ -19,7 +19,7 @@
%define modname youtube-dl
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-youtube-dl
-Version: 2021.03.02
+Version: 2021.03.03
Release: 0
Summary: A Python module for downloading from video sites for offline
watching
License: SUSE-Public-Domain AND CC-BY-SA-3.0
++++++ youtube-dl.spec ++++++
--- /var/tmp/diff_new_pack.ImFBzz/_old 2021-03-03 18:35:27.035399342 +0100
+++ /var/tmp/diff_new_pack.ImFBzz/_new 2021-03-03 18:35:27.035399342 +0100
@@ -17,7 +17,7 @@
Name: youtube-dl
-Version: 2021.03.02
+Version: 2021.03.03
Release: 0
Summary: A tool for downloading from video sites for offline watching
License: SUSE-Public-Domain AND CC-BY-SA-3.0
++++++ youtube-dl-2021.03.02.tar.gz -> youtube-dl-2021.03.03.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/ChangeLog new/youtube-dl/ChangeLog
--- old/youtube-dl/ChangeLog 2021-03-02 00:19:37.000000000 +0100
+++ new/youtube-dl/ChangeLog 2021-03-03 05:47:31.000000000 +0100
@@ -1,3 +1,11 @@
+version 2021.03.03
+
+Extractors
+* [youtube:tab] Switch continuation to browse API (#28289, #28327)
+* [9c9media] Fix extraction for videos with multiple ContentPackages (#28309)
++ [bbc] Add support for BBC Reel videos (#21870, #23660, #28268)
+
+
version 2021.03.02
Extractors
Binary files old/youtube-dl/youtube-dl and new/youtube-dl/youtube-dl differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/bbc.py
new/youtube-dl/youtube_dl/extractor/bbc.py
--- old/youtube-dl/youtube_dl/extractor/bbc.py 2021-02-22 08:52:57.000000000
+0100
+++ new/youtube-dl/youtube_dl/extractor/bbc.py 2021-03-02 00:26:34.000000000
+0100
@@ -5,10 +5,15 @@
import re
from .common import InfoExtractor
+from ..compat import (
+ compat_etree_Element,
+ compat_HTTPError,
+ compat_urlparse,
+)
from ..utils import (
+ ExtractorError,
clean_html,
dict_get,
- ExtractorError,
float_or_none,
get_element_by_class,
int_or_none,
@@ -21,11 +26,6 @@
urlencode_postdata,
urljoin,
)
-from ..compat import (
- compat_etree_Element,
- compat_HTTPError,
- compat_urlparse,
-)
class BBCCoUkIE(InfoExtractor):
@@ -793,6 +793,20 @@
'description': 'Learn English words and phrases from this story',
},
'add_ie': [BBCCoUkIE.ie_key()],
+ }, {
+ # BBC Reel
+ 'url':
'https://www.bbc.com/reel/video/p07c6sb6/how-positive-thinking-is-harming-your-happiness',
+ 'info_dict': {
+ 'id': 'p07c6sb9',
+ 'ext': 'mp4',
+ 'title': 'How positive thinking is harming your happiness',
+ 'alt_title': 'The downsides of positive thinking',
+ 'description': 'md5:fad74b31da60d83b8265954ee42d85b4',
+ 'duration': 235,
+ 'thumbnail': r're:https?://.+/p07c9dsr.jpg',
+ 'upload_date': '20190604',
+ 'categories': ['Psychology'],
+ },
}]
@classmethod
@@ -929,7 +943,7 @@
else:
entry['title'] = info['title']
entry['formats'].extend(info['formats'])
- except Exception as e:
+ except ExtractorError as e:
# Some playlist URL may fail with 500, at
the same time
# the other one may work fine (e.g.
#
http://www.bbc.com/turkce/haberler/2015/06/150615_telabyad_kentin_cogu)
@@ -980,6 +994,37 @@
'subtitles': subtitles,
}
+ # bbc reel (e.g.
https://www.bbc.com/reel/video/p07c6sb6/how-positive-thinking-is-harming-your-happiness)
+ initial_data = self._parse_json(self._html_search_regex(
+
r'<script[^>]+id=(["\'])initial-data\1[^>]+data-json=(["\'])(?P<json>(?:(?!\2).)+)',
+ webpage, 'initial data', default='{}', group='json'), playlist_id,
fatal=False)
+ if initial_data:
+ init_data = try_get(
+ initial_data, lambda x: x['initData']['items'][0], dict) or {}
+ smp_data = init_data.get('smpData') or {}
+ clip_data = try_get(smp_data, lambda x: x['items'][0], dict) or {}
+ version_id = clip_data.get('versionID')
+ if version_id:
+ title = smp_data['title']
+ formats, subtitles = self._download_media_selector(version_id)
+ self._sort_formats(formats)
+ image_url = smp_data.get('holdingImageURL')
+ display_date = init_data.get('displayDate')
+ topic_title = init_data.get('topicTitle')
+
+ return {
+ 'id': version_id,
+ 'title': title,
+ 'formats': formats,
+ 'alt_title': init_data.get('shortTitle'),
+ 'thumbnail': image_url.replace('$recipe', 'raw') if
image_url else None,
+ 'description': smp_data.get('summary') or
init_data.get('shortSummary'),
+ 'upload_date': display_date.replace('-', '') if
display_date else None,
+ 'subtitles': subtitles,
+ 'duration': int_or_none(clip_data.get('duration')),
+ 'categories': [topic_title] if topic_title else None,
+ }
+
# Morph based embed (e.g.
http://www.bbc.co.uk/sport/live/olympics/36895975)
# There are several setPayload calls may be present but the video
# seems to be always related to the first one
@@ -1041,7 +1086,7 @@
thumbnail = None
image_url = current_programme.get('image_url')
if image_url:
- thumbnail = image_url.replace('{recipe}', '1920x1920')
+ thumbnail = image_url.replace('{recipe}', 'raw')
return {
'id': programme_id,
'title': title,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/ninecninemedia.py
new/youtube-dl/youtube_dl/extractor/ninecninemedia.py
--- old/youtube-dl/youtube_dl/extractor/ninecninemedia.py 2021-02-22
08:52:57.000000000 +0100
+++ new/youtube-dl/youtube_dl/extractor/ninecninemedia.py 2021-03-02
00:26:34.000000000 +0100
@@ -23,11 +23,9 @@
destination_code, content_id = re.match(self._VALID_URL, url).groups()
api_base_url = self._API_BASE_TEMPLATE % (destination_code, content_id)
content = self._download_json(api_base_url, content_id, query={
- '$include': '[Media,Season,ContentPackages]',
+ '$include':
'[Media.Name,Season,ContentPackages.Duration,ContentPackages.Id]',
})
title = content['Name']
- if len(content['ContentPackages']) > 1:
- raise ExtractorError('multiple content packages')
content_package = content['ContentPackages'][0]
package_id = content_package['Id']
content_package_url = api_base_url + 'contentpackages/%s/' % package_id
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/rds.py
new/youtube-dl/youtube_dl/extractor/rds.py
--- old/youtube-dl/youtube_dl/extractor/rds.py 2021-02-22 08:52:57.000000000
+0100
+++ new/youtube-dl/youtube_dl/extractor/rds.py 2021-03-02 00:26:34.000000000
+0100
@@ -15,17 +15,17 @@
_VALID_URL =
r'https?://(?:www\.)?rds\.ca/vid(?:[e??]|%C3%A9)os/(?:[^/]+/)*(?P<id>[^/]+)-\d+\.\d+'
_TESTS = [{
- 'url':
'http://www.rds.ca/videos/football/nfl/fowler-jr-prend-la-direction-de-jacksonville-3.1132799',
+ # has two 9c9media ContentPackages, the web player selects the first
ContentPackage
+ 'url':
'https://www.rds.ca/videos/Hockey/NationalHockeyLeague/teams/9/forum-du-5-a-7-jesperi-kotkaniemi-de-retour-de-finlande-3.1377606',
'info_dict': {
- 'id': '604333',
- 'display_id': 'fowler-jr-prend-la-direction-de-jacksonville',
+ 'id': '2083309',
+ 'display_id':
'forum-du-5-a-7-jesperi-kotkaniemi-de-retour-de-finlande',
'ext': 'flv',
- 'title': 'Fowler Jr. prend la direction de Jacksonville',
- 'description': 'Dante Fowler Jr. est le troisi??me choix du
rep??chage 2015 de la NFL. ',
- 'timestamp': 1430397346,
- 'upload_date': '20150430',
- 'duration': 154.354,
- 'age_limit': 0,
+ 'title': 'Forum du 5 ?? 7 : Kotkaniemi de retour de Finlande',
+ 'description': 'md5:83fa38ecc4a79b19e433433254077f25',
+ 'timestamp': 1606129030,
+ 'upload_date': '20201123',
+ 'duration': 773.039,
}
}, {
'url': 'http://www.rds.ca/vid%C3%A9os/un-voyage-positif-3.877934',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/youtube_dl/extractor/youtube.py
new/youtube-dl/youtube_dl/extractor/youtube.py
--- old/youtube-dl/youtube_dl/extractor/youtube.py 2021-02-22
08:53:05.000000000 +0100
+++ new/youtube-dl/youtube_dl/extractor/youtube.py 2021-03-02
00:26:34.000000000 +0100
@@ -2478,24 +2478,37 @@
headers = {
'x-youtube-client-name': '1',
'x-youtube-client-version': '2.20201112.04.01',
+ 'content-type': 'application/json',
}
if identity_token:
headers['x-youtube-identity-token'] = identity_token
+ data = {
+ 'context': {
+ 'client': {
+ 'clientName': 'WEB',
+ 'clientVersion': '2.20201021.03.00',
+ }
+ },
+ }
+
for page_num in itertools.count(1):
if not continuation:
break
+ data['continuation'] = continuation['continuation']
+ data['clickTracking'] = {
+ 'clickTrackingParams': continuation['itct']
+ }
count = 0
retries = 3
while count <= retries:
try:
# Downloading page may result in intermittent 5xx HTTP
error
# that is usually worked around with a retry
- browse = self._download_json(
- 'https://www.youtube.com/browse_ajax', None,
- 'Downloading page %d%s'
- % (page_num, ' (retry #%d)' % count if count else ''),
- headers=headers, query=continuation)
+ response = self._download_json(
+
'https://www.youtube.com/youtubei/v1/browse?key=AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8',
+ None, 'Downloading page %d%s' % (page_num, ' (retry
#%d)' % count if count else ''),
+ headers=headers, data=json.dumps(data).encode('utf8'))
break
except ExtractorError as e:
if isinstance(e.cause, compat_HTTPError) and e.cause.code
in (500, 503):
@@ -2503,9 +2516,6 @@
if count <= retries:
continue
raise
- if not browse:
- break
- response = try_get(browse, lambda x: x[1]['response'], dict)
if not response:
break
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/youtube-dl/youtube_dl/version.py
new/youtube-dl/youtube_dl/version.py
--- old/youtube-dl/youtube_dl/version.py 2021-03-02 00:19:37.000000000
+0100
+++ new/youtube-dl/youtube_dl/version.py 2021-03-03 05:47:31.000000000
+0100
@@ -1,3 +1,3 @@
from __future__ import unicode_literals
-__version__ = '2021.03.02'
+__version__ = '2021.03.03'
