Use _match_id() and remove some extra newline (NFCI) - pkgsrc-localpatches - leot's pkgsrc LOCALPATCHES
(HTM) hg clone https://bitbucket.org/iamleot/pkgsrc-localpatches
(DIR) Log
(DIR) Files
(DIR) Refs
---
(DIR) changeset 5b85de0086d8ab48f8d41ab0db06eb1723dfe852
(DIR) parent fbcbccb8cb3b7b3b7d59754cd26d71e87f3584fd
(HTM) Author: Leonardo Taccari <iamleot@gmail.com>
Date: Sun, 10 Nov 2019 10:33:24
Use _match_id() and remove some extra newline (NFCI)
Diffstat:
net/youtube-dl/patch-youtube__dl_extractor_rai.py | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
---
diff -r fbcbccb8cb3b -r 5b85de0086d8 net/youtube-dl/patch-youtube__dl_extractor_rai.py
--- a/net/youtube-dl/patch-youtube__dl_extractor_rai.py Sun Nov 10 10:18:02 2019 +0100
+++ b/net/youtube-dl/patch-youtube__dl_extractor_rai.py Sun Nov 10 10:33:24 2019 +0100
@@ -48,7 +48,7 @@
},
'params': {
'skip_download': True,
-@@ -171,13 +149,13 @@ class RaiPlayIE(RaiBaseIE):
+@@ -171,13 +149,12 @@ class RaiPlayIE(RaiBaseIE):
url, video_id = mobj.group('url', 'id')
media = self._download_json(
@@ -56,7 +56,7 @@
+ '%s' % url.replace('.html', '.json'), video_id, 'Downloading video JSON')
title = media['name']
-
+-
video = media['video']
- relinker_info = self._extract_relinker_info(video['contentUrl'], video_id)
@@ -64,7 +64,7 @@
self._sort_formats(relinker_info['formats'])
thumbnails = []
-@@ -185,7 +163,7 @@ class RaiPlayIE(RaiBaseIE):
+@@ -185,7 +162,7 @@ class RaiPlayIE(RaiBaseIE):
for _, value in media.get('images').items():
if value:
thumbnails.append({
@@ -73,7 +73,7 @@
})
timestamp = unified_timestamp(try_get(
-@@ -225,7 +203,7 @@ class RaiPlayLiveIE(RaiBaseIE):
+@@ -225,7 +202,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}$',
@@ -82,13 +82,9 @@
'uploader': 'Rai News 24',
'creator': 'Rai News 24',
'is_live': True,
-@@ -236,22 +214,34 @@ class RaiPlayLiveIE(RaiBaseIE):
- }
-
+@@ -238,20 +215,31 @@ class RaiPlayLiveIE(RaiBaseIE):
def _real_extract(self, url):
-- display_id = self._match_id(url)
-+ mobj = re.match(self._VALID_URL, url)
-+ display_id = mobj.group('id')
+ display_id = self._match_id(url)
- webpage = self._download_webpage(url, display_id)
+ media = self._download_json(