pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/youtube-dl
Module Name: pkgsrc
Committed By: leot
Date: Wed Nov 18 17:35:15 UTC 2020
Modified Files:
pkgsrc/net/youtube-dl: Makefile PLIST distinfo
pkgsrc/net/youtube-dl/patches: patch-youtube__dl_extractor_la7.py
patch-youtube__dl_extractor_rai.py
Removed Files:
pkgsrc/net/youtube-dl/patches: patch-youtube__dl_extractor_bandcamp.py
Log Message:
youtube-dl: Update to 20201118
pkgsrc changes:
- Remove patch-youtube__dl_extractor_bandcamp.py, fixed differently upstream
- Update patch-youtube__dl_extractor_rai.py to current rai extractor
- Add a reference to upstream pull request in patch-youtube__dl_extractor_la7.py
Changes:
2020.11.18
----------
Extractors
* [spiegel] Fix extraction (#24206, #24767)
* [youtube] Improve extraction
+ Add support for --no-playlist (#27009)
* Improve playlist and mix extraction (#26390, #26509, #26534, #27011)
+ Extract playlist uploader data
* [youtube:tab] Fix view count extraction (#27051)
* [malltv] Fix extraction (#27035)
+ [bandcamp] Extract playlist description (#22684)
* [urplay] Fix extraction (#26828)
* [youtube:tab] Fix playlist title extraction (#27015)
* [youtube] Fix chapters extraction (#26005)
2020.11.17
----------
Core
* [utils] Skip ! prefixed code in js_to_json
Extractors
* [youtube:tab] Fix extraction with cookies provided (#27005)
* [lrt] Fix extraction with empty tags (#20264)
+ [ndr:embed:base] Extract subtitles (#25447, #26106)
+ [servus] Add support for pm-wissen.com (#25869)
* [servus] Fix extraction (#26872, #26967, #26983, #27000)
* [xtube] Fix extraction (#26996)
* [lrt] Fix extraction
+ [lbry] Add support for lbry.tv
+ [condenast] Extract subtitles
* [condenast] Fix extraction
* [bandcamp] Fix extraction (#26681, #26684)
* [rai] Fix RaiPlay extraction (#26064, #26096)
* [vlive] Fix extraction
* [usanetwork] Fix extraction
* [nbc] Fix NBCNews/Today/MSNBC extraction
* [cnbc] Fix extraction
To generate a diff of this commit:
cvs rdiff -u -r1.218 -r1.219 pkgsrc/net/youtube-dl/Makefile
cvs rdiff -u -r1.99 -r1.100 pkgsrc/net/youtube-dl/PLIST
cvs rdiff -u -r1.200 -r1.201 pkgsrc/net/youtube-dl/distinfo
cvs rdiff -u -r1.1 -r0 \
pkgsrc/net/youtube-dl/patches/patch-youtube__dl_extractor_bandcamp.py
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/net/youtube-dl/patches/patch-youtube__dl_extractor_la7.py \
pkgsrc/net/youtube-dl/patches/patch-youtube__dl_extractor_rai.py
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/youtube-dl/Makefile
diff -u pkgsrc/net/youtube-dl/Makefile:1.218 pkgsrc/net/youtube-dl/Makefile:1.219
--- pkgsrc/net/youtube-dl/Makefile:1.218 Thu Nov 12 14:41:38 2020
+++ pkgsrc/net/youtube-dl/Makefile Wed Nov 18 17:35:15 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.218 2020/11/12 14:41:38 leot Exp $
+# $NetBSD: Makefile,v 1.219 2020/11/18 17:35:15 leot Exp $
# XXX: VERSION_DATE can contains also an optional part that indicates
# XXX: possible same day revisions. PKGNAME preserves that dotted part as is.
-VERSION_DATE= 2020.11.12
+VERSION_DATE= 2020.11.18
DISTNAME= youtube-dl-${VERSION_DATE}
PKGNAME= ${DISTNAME:S/.//:S/.//}
CATEGORIES= net
Index: pkgsrc/net/youtube-dl/PLIST
diff -u pkgsrc/net/youtube-dl/PLIST:1.99 pkgsrc/net/youtube-dl/PLIST:1.100
--- pkgsrc/net/youtube-dl/PLIST:1.99 Sun Feb 16 19:28:47 2020
+++ pkgsrc/net/youtube-dl/PLIST Wed Nov 18 17:35:15 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.99 2020/02/16 19:28:47 leot Exp $
+@comment $NetBSD: PLIST,v 1.100 2020/11/18 17:35:15 leot Exp $
bin/youtube-dl
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -968,6 +968,9 @@ ${PYSITELIB}/youtube_dl/extractor/la7.py
${PYSITELIB}/youtube_dl/extractor/laola1tv.py
${PYSITELIB}/youtube_dl/extractor/laola1tv.pyc
${PYSITELIB}/youtube_dl/extractor/laola1tv.pyo
+${PYSITELIB}/youtube_dl/extractor/lbry.py
+${PYSITELIB}/youtube_dl/extractor/lbry.pyc
+${PYSITELIB}/youtube_dl/extractor/lbry.pyo
${PYSITELIB}/youtube_dl/extractor/lci.py
${PYSITELIB}/youtube_dl/extractor/lci.pyc
${PYSITELIB}/youtube_dl/extractor/lci.pyo
@@ -1709,9 +1712,6 @@ ${PYSITELIB}/youtube_dl/extractor/spankw
${PYSITELIB}/youtube_dl/extractor/spiegel.py
${PYSITELIB}/youtube_dl/extractor/spiegel.pyc
${PYSITELIB}/youtube_dl/extractor/spiegel.pyo
-${PYSITELIB}/youtube_dl/extractor/spiegeltv.py
-${PYSITELIB}/youtube_dl/extractor/spiegeltv.pyc
-${PYSITELIB}/youtube_dl/extractor/spiegeltv.pyo
${PYSITELIB}/youtube_dl/extractor/spike.py
${PYSITELIB}/youtube_dl/extractor/spike.pyc
${PYSITELIB}/youtube_dl/extractor/spike.pyo
Index: pkgsrc/net/youtube-dl/distinfo
diff -u pkgsrc/net/youtube-dl/distinfo:1.200 pkgsrc/net/youtube-dl/distinfo:1.201
--- pkgsrc/net/youtube-dl/distinfo:1.200 Thu Nov 12 14:41:38 2020
+++ pkgsrc/net/youtube-dl/distinfo Wed Nov 18 17:35:15 2020
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.200 2020/11/12 14:41:38 leot Exp $
+$NetBSD: distinfo,v 1.201 2020/11/18 17:35:15 leot Exp $
-SHA1 (youtube-dl-2020.11.12.tar.gz) = 04e72d0b0a0e85b79a6c2ac93b7c85254b95b53b
-RMD160 (youtube-dl-2020.11.12.tar.gz) = 2afd73b5c09463951086b29298489f0d203a2207
-SHA512 (youtube-dl-2020.11.12.tar.gz) = 7db373f6cc252635a3613ffe0b3b10640e262778105ebbd78b837fe019b0a2609032d2aeb81b239e000a86220aff99d2c018a9a6325adad6981a8ab64048131c
-Size (youtube-dl-2020.11.12.tar.gz) = 3188015 bytes
+SHA1 (youtube-dl-2020.11.18.tar.gz) = e1b922ebc543f35ea7ee3de7e28e8deea7b97914
+RMD160 (youtube-dl-2020.11.18.tar.gz) = e526d2c4f297390cba92ae91d70223e9be3171e6
+SHA512 (youtube-dl-2020.11.18.tar.gz) = 110de857759b4c4bd0160242adebb3d8690bda2203a28a7b1a2ac1cdd9bca058702fd0b323010629e74bbb2df38f50c67b710bc2a6ad4cc907827ee013d0dbcf
+Size (youtube-dl-2020.11.18.tar.gz) = 3186065 bytes
SHA1 (patch-setup.py) = a67074ae7cfe5e77847c2f610337ea553eddb69b
-SHA1 (patch-youtube__dl_extractor_bandcamp.py) = 81855a3f4f8c03f61fe543eb339c0e67bf52682e
-SHA1 (patch-youtube__dl_extractor_la7.py) = e246750808305343227060acdc5a38583ef071e9
-SHA1 (patch-youtube__dl_extractor_rai.py) = 3dbad7852b38e7364a248a5c9851c50cd2ff9b38
+SHA1 (patch-youtube__dl_extractor_la7.py) = 6c579f96e7ace1b64ef25fe8788b40bc4e7e67dd
+SHA1 (patch-youtube__dl_extractor_rai.py) = 5ec18da74c46f2195fe814d61ca044df4b70cc45
SHA1 (patch-youtube__dl_postprocessor_ffmpeg.py) = f96676170a448d9205d542a7def4beca615a1490
Index: pkgsrc/net/youtube-dl/patches/patch-youtube__dl_extractor_la7.py
diff -u pkgsrc/net/youtube-dl/patches/patch-youtube__dl_extractor_la7.py:1.2 pkgsrc/net/youtube-dl/patches/patch-youtube__dl_extractor_la7.py:1.3
--- pkgsrc/net/youtube-dl/patches/patch-youtube__dl_extractor_la7.py:1.2 Mon Mar 23 20:32:23 2020
+++ pkgsrc/net/youtube-dl/patches/patch-youtube__dl_extractor_la7.py Wed Nov 18 17:35:15 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-youtube__dl_extractor_la7.py,v 1.2 2020/03/23 20:32:23 leot Exp $
+$NetBSD: patch-youtube__dl_extractor_la7.py,v 1.3 2020/11/18 17:35:15 leot Exp $
[la7] Fix extraction (closes #23323)
@@ -14,7 +14,11 @@ tests!
Closes #23323.
---- youtube_dl/extractor/la7.py.orig
+Shared upstream via:
+
+ https://github.com/ytdl-org/youtube-dl/pull/23641
+
+--- youtube_dl/extractor/la7.py.orig 2020-11-16 21:04:10.000000000 +0000
+++ youtube_dl/extractor/la7.py
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
@@ -24,7 +28,7 @@ Closes #23323.
smuggle_url,
)
-@@ -23,21 +22,12 @@ class LA7IE(InfoExtractor):
+@@ -23,22 +22,13 @@ class LA7IE(InfoExtractor):
'id': '0_42j6wd36',
'ext': 'mp4',
'title': 'Inc.Cool8',
@@ -35,7 +39,7 @@ Closes #23323.
'timestamp': 1443814869,
'upload_date': '20151002',
},
-- }, {
+ }, {
- # 'src' is a dictionary
- 'url': 'http://tg.la7.it/repliche-tgla7?id=189080',
- 'md5': '6b0d8888d286e39870208dfeceaf456b',
@@ -44,9 +48,10 @@ Closes #23323.
- 'ext': 'mp4',
- 'title': 'TG LA7',
- },
- }, {
+- }, {
'url': 'http://www.la7.it/omnibus/rivedila7/omnibus-news-02-07-2016-189077',
'only_matching': True,
+ }]
@@ -48,20 +38,19 @@ class LA7IE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
Index: pkgsrc/net/youtube-dl/patches/patch-youtube__dl_extractor_rai.py
diff -u pkgsrc/net/youtube-dl/patches/patch-youtube__dl_extractor_rai.py:1.2 pkgsrc/net/youtube-dl/patches/patch-youtube__dl_extractor_rai.py:1.3
--- pkgsrc/net/youtube-dl/patches/patch-youtube__dl_extractor_rai.py:1.2 Sun Sep 6 09:54:34 2020
+++ pkgsrc/net/youtube-dl/patches/patch-youtube__dl_extractor_rai.py Wed Nov 18 17:35:15 2020
@@ -1,13 +1,12 @@
-$NetBSD: patch-youtube__dl_extractor_rai.py,v 1.2 2020/09/06 09:54:34 leot Exp $
+$NetBSD: patch-youtube__dl_extractor_rai.py,v 1.3 2020/11/18 17:35:15 leot Exp $
[rai] Fix extraction for recent raiplay.it updates
- Introduce _BASE_URL in RaiBaseIE class so it could be reused as base for the
several subextractors.
-- Remove first test of RaiPlayIE, it is no longer available
-- Adjust RaiPlayIE to recent raiplay.it updates, make it extension agnostic
- (passing possible `.json' URLs is now supported too) and update test
- info_dict.
+- Remove first test of RaiPlayIE: it is no longer available
+- Make RaiPlayIE extension-agnostic (passing possible `.json' URLs is now
+ supported too)
- Adjust RaiPlayLiveIE to recent raiplay.it updates. Passing it as
`url_transparent' is no longer supported (there is no longer an accessible
ContentItem)
@@ -15,28 +14,23 @@ $NetBSD: patch-youtube__dl_extractor_rai
ContentSet-s.
- Update a RaiIE test and remove two tests that are no longer availables
-This fix issue #22923, #22906 and supersedes #23006.
+This fix issue #22923, #22906 and supersedes #23006 and #23040.
Shared upstream via:
- https://github.com/ytdl-org/youtube-dl/pull/23040
+ https://github.com/ytdl-org/youtube-dl/pull/27077
---- youtube_dl/extractor/rai.py.orig
+--- youtube_dl/extractor/rai.py.orig 2020-11-16 21:04:10.000000000 +0000
+++ youtube_dl/extractor/rai.py
-@@ -1,3 +1,4 @@
-+# coding: utf-8
- from __future__ import unicode_literals
-
- import re
-@@ -17,7 +18,6 @@
+@@ -17,7 +17,6 @@ from ..utils import (
+ int_or_none,
parse_duration,
strip_or_none,
- try_get,
- unescapeHTML,
unified_strdate,
unified_timestamp,
update_url_query,
-@@ -30,6 +30,7 @@ class RaiBaseIE(InfoExtractor):
+@@ -30,6 +29,7 @@ class RaiBaseIE(InfoExtractor):
_UUID_RE = r'[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}'
_GEO_COUNTRIES = ['IT']
_GEO_BYPASS = False
@@ -44,7 +38,7 @@ Shared upstream via:
def _extract_relinker_info(self, relinker_url, video_id):
if not re.match(r'https?://', relinker_url):
-@@ -122,41 +123,19 @@ def _extract_subtitles(url, subtitle_url):
+@@ -122,27 +122,8 @@ class RaiBaseIE(InfoExtractor):
class RaiPlayIE(RaiBaseIE):
@@ -68,58 +62,26 @@ Shared upstream via:
- 'series': 'La Casa Bianca',
- 'season': '2016',
- },
+- 'skip': 'This content is not available',
- }, {
'url': 'http://www.raiplay.it/video/2014/04/Report-del-07042014-cb27157f-9dd0-4aee-b788-b1f67643a391.html',
'md5': '8970abf8caf8aef4696e7b1f2adfc696',
'info_dict': {
- 'id': 'cb27157f-9dd0-4aee-b788-b1f67643a391',
- 'ext': 'mp4',
- 'title': 'Report del 07/04/2014',
-- 'alt_title': 'S2013/14 - Puntata del 07/04/2014',
-- 'description': 'md5:f27c544694cacb46a078db84ec35d2d9',
-+ 'alt_title': 'St 2013/14 - Espresso nel caffè - 07/04/2014 ',
-+ 'description': 'md5:d730c168a58f4bb35600fc2f881ec04e',
- 'thumbnail': r're:^https?://.*\.jpg$',
-- 'uploader': 'Rai 5',
-- 'creator': 'Rai 5',
-+ 'uploader': 'Rai Gulp',
- 'duration': 6160,
-- 'series': 'Report',
-- 'season_number': 5,
-- 'season': '2013/14',
- },
- 'params': {
- 'skip_download': True,
-@@ -168,16 +147,15 @@ class RaiPlayIE(RaiBaseIE):
+@@ -166,10 +147,11 @@ class RaiPlayIE(RaiBaseIE):
+ }]
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
-- url, video_id = mobj.group('url', 'id')
+- url, video_id = re.match(self._VALID_URL, url).groups()
++ mobj = re.match(self._VALID_URL, url)
+ url, base, video_id, ext = mobj.group('url', 'base', 'id', 'ext')
media = self._download_json(
-- '%s?json' % url, video_id, 'Downloading video JSON')
+- url.replace('.html', '.json'), video_id, 'Downloading video JSON')
+ '%s%s.json' % (base, video_id), video_id, 'Downloading video JSON')
title = media['name']
--
- video = media['video']
-
-- relinker_info = self._extract_relinker_info(video['contentUrl'], video_id)
-+ relinker_info = self._extract_relinker_info(video['content_url'], video_id)
- self._sort_formats(relinker_info['formats'])
- thumbnails = []
-@@ -185,7 +163,7 @@ def _real_extract(self, url):
- for _, value in media.get('images').items():
- if value:
- thumbnails.append({
-- 'url': value.replace('[RESOLUTION]', '600x400')
-+ 'url': urljoin(RaiBaseIE._BASE_URL, value.replace('[RESOLUTION]', '600x400'))
- })
-
- timestamp = unified_timestamp(try_get(
-@@ -225,7 +203,7 @@ class RaiPlayLiveIE(RaiBaseIE):
+@@ -227,7 +209,7 @@ class RaiPlayLiveIE(RaiBaseIE):
'display_id': 'rainews24',
'ext': 'mp4',
'title': 're:^Diretta di Rai News 24 [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
@@ -128,7 +90,7 @@ Shared upstream via:
'uploader': 'Rai News 24',
'creator': 'Rai News 24',
'is_live': True,
-@@ -238,20 +216,32 @@ class RaiPlayLiveIE(RaiBaseIE):
+@@ -240,20 +222,32 @@ class RaiPlayLiveIE(RaiBaseIE):
def _real_extract(self, url):
display_id = self._match_id(url)
@@ -140,13 +102,14 @@ Shared upstream via:
+ title = media['name']
+ video = media['video']
+ video_id = media['id'].replace('ContentItem-', '')
++
++ relinker_info = self._extract_relinker_info(video['content_url'], video_id)
++ self._sort_formats(relinker_info['formats'])
- video_id = self._search_regex(
- r'data-uniquename=["\']ContentItem-(%s)' % RaiBaseIE._UUID_RE,
- webpage, 'content id')
-+ relinker_info = self._extract_relinker_info(video['content_url'], video_id)
-+ self._sort_formats(relinker_info['formats'])
-
+-
- return {
- '_type': 'url_transparent',
- 'ie_key': RaiPlayIE.ie_key(),
@@ -169,7 +132,7 @@ Shared upstream via:
class RaiPlayPlaylistIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?raiplay\.it/programmi/(?P<id>[^/?#&]+)'
-@@ -260,7 +250,7 @@ class RaiPlayPlaylistIE(InfoExtractor):
+@@ -262,7 +256,7 @@ class RaiPlayPlaylistIE(InfoExtractor):
'info_dict': {
'id': 'nondirloalmiocapo',
'title': 'Non dirlo al mio capo',
@@ -178,7 +141,7 @@ Shared upstream via:
},
'playlist_mincount': 12,
}]
-@@ -268,21 +258,25 @@ class RaiPlayPlaylistIE(InfoExtractor):
+@@ -270,21 +264,25 @@ class RaiPlayPlaylistIE(InfoExtractor):
def _real_extract(self, url):
playlist_id = self._match_id(url)
@@ -216,20 +179,10 @@ Shared upstream via:
return self.playlist_result(entries, playlist_id, title, description)
-@@ -316,7 +310,7 @@ class RaiIE(RaiBaseIE):
- }, {
- # with ContentItem in og:url
- 'url': 'http://www.rai.it/dl/RaiTV/programmi/media/ContentItem-efb17665-691c-45d5-a60c-5301333cbb0c.html',
-- 'md5': '11959b4e44fa74de47011b5799490adf',
-+ 'md5': '6865dd00cf0bbf5772fdd89d59bd768a',
- 'info_dict': {
- 'id': 'efb17665-691c-45d5-a60c-5301333cbb0c',
- 'ext': 'mp4',
-@@ -326,18 +320,6 @@ class RaiIE(RaiBaseIE):
- 'duration': 2214,
+@@ -330,19 +328,6 @@ class RaiIE(RaiBaseIE):
'upload_date': '20161103',
}
-- }, {
+ }, {
- # drawMediaRaiTV(...)
- 'url': 'http://www.report.rai.it/dl/Report/puntata/ContentItem-0c7a664b-d0f4-4b2c-8835-3f82e46f433e.html',
- 'md5': '2dd727e61114e1ee9c47f0da6914e178',
@@ -241,14 +194,15 @@ Shared upstream via:
- 'thumbnail': r're:^https?://.*\.jpg$',
- 'upload_date': '20141221',
- },
- }, {
+- 'skip': 'This content is not available',
+- }, {
# initEdizione('ContentItem-...'
'url': 'http://www.tg1.rai.it/dl/tg1/2010/edizioni/ContentSet-9b6e0cba-4bef-4aef-8cf0-9f7f665b7dfb-tg1.html?item=undefined',
-@@ -349,17 +331,6 @@ class RaiIE(RaiBaseIE):
- 'upload_date': '20170401',
+ 'info_dict': {
+@@ -354,18 +339,6 @@ class RaiIE(RaiBaseIE):
},
'skip': 'Changes daily',
-- }, {
+ }, {
- # HDS live stream with only relinker URL
- 'url': 'http://www.rai.tv/dl/RaiTV/dirette/PublishingBlock-1912dbbf-3f96-44c3-b4cf-523681fbacbc.html?channel=EuroNews',
- 'info_dict': {
@@ -259,6 +213,8 @@ Shared upstream via:
- 'params': {
- 'skip_download': True,
- },
- }, {
+- 'skip': 'This content is available only in Italy',
+- }, {
# HLS live stream with ContentItem in og:url
'url': 'http://www.rainews.it/dl/rainews/live/ContentItem-3156f2f2-dc70-4953-8e2f-70d7489d4ce9.html',
+ 'info_dict': {
Home |
Main Index |
Thread Index |
Old Index