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: Sun Sep 6 09:54:34 UTC 2020
Modified Files:
pkgsrc/net/youtube-dl: Makefile distinfo
pkgsrc/net/youtube-dl/patches: patch-youtube__dl_extractor_rai.py
Log Message:
youtube-dl: Update to 20200906
pkgsrc changes:
* Update patch for the [rai] extractor (only related to tests)
Changes:
20200906
--------
Core
+ [utils] Recognize wav mimetype (#26463)
Extractors
* [nrktv:episode] Improve video id extraction (#25594, #26369, #26409)
* [youtube] Fix age gate content detection (#26100, #26152, #26311, #26384)
* [youtube:user] Extend URL regular expression (#26443)
* [xhamster] Improve initials regular expression (#26526, #26353)
* [svtplay] Fix video id extraction (#26425, #26428, #26438)
* [twitch] Rework extractors (#12297, #20414, #20604, #21811, #21812, #22979,
#24263, #25010, #25553, #25606)
* Switch to GraphQL
+ Add support for collections
+ Add support for clips and collections playlists
* [biqle] Improve video ext extraction
* [xhamster] Fix extraction (#26157, #26254)
* [xhamster] Extend URL regular expression (#25789, #25804, #25927))
To generate a diff of this commit:
cvs rdiff -u -r1.211 -r1.212 pkgsrc/net/youtube-dl/Makefile
cvs rdiff -u -r1.193 -r1.194 pkgsrc/net/youtube-dl/distinfo
cvs rdiff -u -r1.1 -r1.2 \
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.211 pkgsrc/net/youtube-dl/Makefile:1.212
--- pkgsrc/net/youtube-dl/Makefile:1.211 Mon Jul 27 22:21:45 2020
+++ pkgsrc/net/youtube-dl/Makefile Sun Sep 6 09:54:34 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.211 2020/07/27 22:21:45 leot Exp $
+# $NetBSD: Makefile,v 1.212 2020/09/06 09:54:34 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.07.28
+VERSION_DATE= 2020.09.06
DISTNAME= youtube-dl-${VERSION_DATE}
PKGNAME= ${DISTNAME:S/.//:S/.//}
CATEGORIES= net
Index: pkgsrc/net/youtube-dl/distinfo
diff -u pkgsrc/net/youtube-dl/distinfo:1.193 pkgsrc/net/youtube-dl/distinfo:1.194
--- pkgsrc/net/youtube-dl/distinfo:1.193 Mon Jul 27 22:21:45 2020
+++ pkgsrc/net/youtube-dl/distinfo Sun Sep 6 09:54:34 2020
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.193 2020/07/27 22:21:45 leot Exp $
+$NetBSD: distinfo,v 1.194 2020/09/06 09:54:34 leot Exp $
-SHA1 (youtube-dl-2020.07.28.tar.gz) = 2193c2719fcb84300e3e175a61c7ec194ac1bc01
-RMD160 (youtube-dl-2020.07.28.tar.gz) = f045747796d3069e3244dd072857f4d412489b3a
-SHA512 (youtube-dl-2020.07.28.tar.gz) = be18cd53577a1e750a9610d481225b5683414ee4a095aa90b1a9ef150e9009bec4c2188f19f13505c88ac0179872751a07f5fb4b591beca3cefd11ccf071132d
-Size (youtube-dl-2020.07.28.tar.gz) = 3179686 bytes
+SHA1 (youtube-dl-2020.09.06.tar.gz) = 25ff1e81945cdf106892b78114e01d144916ad04
+RMD160 (youtube-dl-2020.09.06.tar.gz) = 79d7263dc2a3ced304da9d724d5bb5fac2d5155f
+SHA512 (youtube-dl-2020.09.06.tar.gz) = 866962ab6a3c24b1951232ffb15c9f49c56156d9cbffa3ad265ee905f4b8e63cbc9695acf0a703c945a3d5da4e6cb4cd67add7f2452d54b0f152eb6ed20a0a7a
+Size (youtube-dl-2020.09.06.tar.gz) = 3182124 bytes
SHA1 (patch-setup.py) = a67074ae7cfe5e77847c2f610337ea553eddb69b
SHA1 (patch-youtube__dl_extractor_la7.py) = e246750808305343227060acdc5a38583ef071e9
-SHA1 (patch-youtube__dl_extractor_rai.py) = ae67a6fb599c90491fd68b72bf71821659a2eca4
+SHA1 (patch-youtube__dl_extractor_rai.py) = 3dbad7852b38e7364a248a5c9851c50cd2ff9b38
SHA1 (patch-youtube__dl_postprocessor_ffmpeg.py) = f96676170a448d9205d542a7def4beca615a1490
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.1 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.1 Mon Dec 9 11:45:59 2019
+++ pkgsrc/net/youtube-dl/patches/patch-youtube__dl_extractor_rai.py Sun Sep 6 09:54:34 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-youtube__dl_extractor_rai.py,v 1.1 2019/12/09 11:45:59 leot Exp $
+$NetBSD: patch-youtube__dl_extractor_rai.py,v 1.2 2020/09/06 09:54:34 leot Exp $
[rai] Fix extraction for recent raiplay.it updates
@@ -13,6 +13,7 @@ $NetBSD: patch-youtube__dl_extractor_rai
ContentItem)
- Adjust RaiPlayPlaylistIE to recent raiplay.it updates and instruct it about
ContentSet-s.
+- Update a RaiIE test and remove two tests that are no longer availables
This fix issue #22923, #22906 and supersedes #23006.
@@ -22,7 +23,12 @@ Shared upstream via:
--- youtube_dl/extractor/rai.py.orig
+++ youtube_dl/extractor/rai.py
-@@ -17,7 +17,6 @@
+@@ -1,3 +1,4 @@
++# coding: utf-8
+ from __future__ import unicode_literals
+
+ import re
+@@ -17,7 +18,6 @@
parse_duration,
strip_or_none,
try_get,
@@ -30,7 +36,7 @@ Shared upstream via:
unified_strdate,
unified_timestamp,
update_url_query,
-@@ -30,6 +29,7 @@ class RaiBaseIE(InfoExtractor):
+@@ -30,6 +30,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
@@ -38,7 +44,7 @@ Shared upstream via:
def _extract_relinker_info(self, relinker_url, video_id):
if not re.match(r'https?://', relinker_url):
-@@ -122,41 +122,19 @@ def _extract_subtitles(url, subtitle_url):
+@@ -122,41 +123,19 @@ def _extract_subtitles(url, subtitle_url):
class RaiPlayIE(RaiBaseIE):
@@ -84,7 +90,7 @@ Shared upstream via:
},
'params': {
'skip_download': True,
-@@ -168,16 +146,15 @@ class RaiPlayIE(RaiBaseIE):
+@@ -168,16 +147,15 @@ class RaiPlayIE(RaiBaseIE):
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
@@ -104,7 +110,7 @@ Shared upstream via:
self._sort_formats(relinker_info['formats'])
thumbnails = []
-@@ -185,7 +162,7 @@ def _real_extract(self, url):
+@@ -185,7 +163,7 @@ def _real_extract(self, url):
for _, value in media.get('images').items():
if value:
thumbnails.append({
@@ -113,7 +119,7 @@ Shared upstream via:
})
timestamp = unified_timestamp(try_get(
-@@ -225,7 +202,7 @@ class RaiPlayLiveIE(RaiBaseIE):
+@@ -225,7 +203,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}$',
@@ -122,7 +128,7 @@ Shared upstream via:
'uploader': 'Rai News 24',
'creator': 'Rai News 24',
'is_live': True,
-@@ -238,20 +215,32 @@ class RaiPlayLiveIE(RaiBaseIE):
+@@ -238,20 +216,32 @@ class RaiPlayLiveIE(RaiBaseIE):
def _real_extract(self, url):
display_id = self._match_id(url)
@@ -130,14 +136,14 @@ Shared upstream via:
+ media = self._download_json(
+ '%s.json' % urljoin(RaiBaseIE._BASE_URL, 'dirette/' + display_id),
+ display_id, 'Downloading channel JSON')
++
++ title = media['name']
++ video = media['video']
++ video_id = media['id'].replace('ContentItem-', '')
- video_id = self._search_regex(
- r'data-uniquename=["\']ContentItem-(%s)' % RaiBaseIE._UUID_RE,
- webpage, 'content id')
-+ 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'])
@@ -163,7 +169,7 @@ Shared upstream via:
class RaiPlayPlaylistIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?raiplay\.it/programmi/(?P<id>[^/?#&]+)'
-@@ -260,7 +249,7 @@ class RaiPlayPlaylistIE(InfoExtractor):
+@@ -260,7 +250,7 @@ class RaiPlayPlaylistIE(InfoExtractor):
'info_dict': {
'id': 'nondirloalmiocapo',
'title': 'Non dirlo al mio capo',
@@ -172,7 +178,7 @@ Shared upstream via:
},
'playlist_mincount': 12,
}]
-@@ -268,21 +257,25 @@ class RaiPlayPlaylistIE(InfoExtractor):
+@@ -268,21 +258,25 @@ class RaiPlayPlaylistIE(InfoExtractor):
def _real_extract(self, url):
playlist_id = self._match_id(url)
@@ -180,14 +186,14 @@ Shared upstream via:
+ media = self._download_json(
+ '%s.json' % urljoin(RaiBaseIE._BASE_URL, 'programmi/' + playlist_id),
+ playlist_id, 'Downloading program JSON')
-+
-+ title = media['name']
-+ description = media['program_info']['description']
- title = self._html_search_meta(
- ('programma', 'nomeProgramma'), webpage, 'title')
- description = unescapeHTML(self._html_search_meta(
- ('description', 'og:description'), webpage, 'description'))
++ title = media['name']
++ description = media['program_info']['description']
++
+ content_sets = [s['id'] for b in media['blocks'] for s in b['sets']]
entries = []
@@ -210,3 +216,49 @@ 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,
+ 'upload_date': '20161103',
+ }
+- }, {
+- # drawMediaRaiTV(...)
+- 'url': 'http://www.report.rai.it/dl/Report/puntata/ContentItem-0c7a664b-d0f4-4b2c-8835-3f82e46f433e.html',
+- 'md5': '2dd727e61114e1ee9c47f0da6914e178',
+- 'info_dict': {
+- 'id': '59d69d28-6bb6-409d-a4b5-ed44096560af',
+- 'ext': 'mp4',
+- 'title': 'Il pacco',
+- 'description': 'md5:4b1afae1364115ce5d78ed83cd2e5b3a',
+- 'thumbnail': r're:^https?://.*\.jpg$',
+- 'upload_date': '20141221',
+- },
+ }, {
+ # 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',
+ },
+ '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': {
+- 'id': '1912dbbf-3f96-44c3-b4cf-523681fbacbc',
+- 'ext': 'flv',
+- 'title': 'EuroNews',
+- },
+- 'params': {
+- 'skip_download': True,
+- },
+ }, {
+ # HLS live stream with ContentItem in og:url
+ 'url': 'http://www.rainews.it/dl/rainews/live/ContentItem-3156f2f2-dc70-4953-8e2f-70d7489d4ce9.html',
Home |
Main Index |
Thread Index |
Old Index