From e0a81c094d2ad366acfd5045536c174ef1fbc727 Mon Sep 17 00:00:00 2001 From: audrius Date: Mon, 16 Sep 2019 17:22:11 -0700 Subject: [PATCH 1/3] [lrt] fixing broken extractor --- youtube_dl/extractor/lrt.py | 112 ++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 63 deletions(-) diff --git a/youtube_dl/extractor/lrt.py b/youtube_dl/extractor/lrt.py index f5c997ef4..efca98677 100644 --- a/youtube_dl/extractor/lrt.py +++ b/youtube_dl/extractor/lrt.py @@ -1,14 +1,12 @@ # coding: utf-8 from __future__ import unicode_literals -import re - from .common import InfoExtractor from ..utils import ( - determine_ext, - int_or_none, - parse_duration, - remove_end, + unified_timestamp, + clean_html, + ExtractorError, + try_get, ) @@ -17,78 +15,66 @@ class LRTIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?lrt\.lt/mediateka/irasas/(?P[0-9]+)' _TESTS = [{ # m3u8 download - 'url': 'http://www.lrt.lt/mediateka/irasas/54391/', - 'md5': 'fe44cf7e4ab3198055f2c598fc175cb0', + 'url': 'https://www.lrt.lt/mediateka/irasas/2000078895/loterija-keno-loto', + # md5 for first 10240 bytes of content + 'md5': '8e6f0121ccacc17d91f98837c66853f0', 'info_dict': { - 'id': '54391', + 'id': '2000078895', 'ext': 'mp4', - 'title': 'Septynios Kauno dienos', - 'description': 'md5:24d84534c7dc76581e59f5689462411a', - 'duration': 1783, - 'view_count': int, - 'like_count': int, + 'title': u'Loterija \u201eKeno Loto\u201c', + 'description': u'Tira\u017eo nr.: 7993.', + 'timestamp': 1568658420, + 'tags': [u'Loterija \u201eKeno Loto\u201c', u'LRT TELEVIZIJA'], + 'upload_date': '20190916', }, }, { - # direct mp3 download - 'url': 'http://www.lrt.lt/mediateka/irasas/1013074524/', - 'md5': '389da8ca3cad0f51d12bed0c844f6a0a', + # m4a download + 'url': 'https://www.lrt.lt/mediateka/irasas/2000068931/vakaro-pasaka-bebriukas', + # md5 for first 11297 bytes of content + 'md5': 'f02072fb3c416c1c8f5969ea7b70f53b', 'info_dict': { - 'id': '1013074524', - 'ext': 'mp3', - 'title': 'Kita tema 2016-09-05 15:05', - 'description': 'md5:1b295a8fc7219ed0d543fc228c931fb5', - 'duration': 3008, - 'view_count': int, - 'like_count': int, + 'id': '2000068931', + 'ext': 'm4a', + 'title': u'Vakaro pasaka. Bebriukas', + 'description': u'Est\u0173 pasaka \u201eBebriukas\u201d. Skaito aktorius Antanas \u0160urna.', + 'timestamp': 1558461780, + 'tags': [u'LRT RADIJAS', u'Vakaro pasaka', u'Bebriukas'], + 'upload_date': '20190521', }, }] + MEDIA_INFO_URL = 'https://www.lrt.lt/servisai/stream_url/vod/media_info/' + THUMBNAIL_URL = 'https://www.lrt.lt' + QUERY_URL = '/mediateka/irasas/' + def _real_extract(self, url): video_id = self._match_id(url) - webpage = self._download_webpage(url, video_id) + media_info = self._download_json(self.MEDIA_INFO_URL, video_id, query={'url': self.QUERY_URL + video_id}) - title = remove_end(self._og_search_title(webpage), ' - LRT') + video_id = try_get(media_info, lambda x: x.get('id'), int) + if not video_id: + raise ExtractorError("Unable to fetch media info") - formats = [] - for _, file_url in re.findall( - r'file\s*:\s*(["\'])(?P(?:(?!\1).)+)\1', webpage): - ext = determine_ext(file_url) - if ext not in ('m3u8', 'mp3'): - continue - # mp3 served as m3u8 produces stuttered media file - if ext == 'm3u8' and '.mp3' in file_url: - continue - if ext == 'm3u8': - formats.extend(self._extract_m3u8_formats( - file_url, video_id, 'mp4', entry_protocol='m3u8_native', - fatal=False)) - elif ext == 'mp3': - formats.append({ - 'url': file_url, - 'vcodec': 'none', - }) - self._sort_formats(formats) + playlist_item = media_info.get('playlist_item', {}) + file = playlist_item.get('file') + if not file: + raise ExtractorError("Media info did not contain m3u8 file url") - thumbnail = self._og_search_thumbnail(webpage) - description = self._og_search_description(webpage) - duration = parse_duration(self._search_regex( - r'var\s+record_len\s*=\s*(["\'])(?P[0-9]+:[0-9]+:[0-9]+)\1', - webpage, 'duration', default=None, group='duration')) + if ".m4a" in file: + # audio only content + formats = [{'url': file, 'vcodec': 'none', 'ext': 'm4a'}] + else: + formats = self._extract_m3u8_formats(file, video_id, 'mp4', entry_protocol='m3u8_native') - view_count = int_or_none(self._html_search_regex( - r']+class=(["\']).*?record-desc-seen.*?\1[^>]*>(?P.+?)', - webpage, 'view count', fatal=False, group='count')) - like_count = int_or_none(self._search_regex( - r']+id=(["\'])flikesCount.*?\1>(?P\d+)<', - webpage, 'like count', fatal=False, group='count')) + # adjust media datetime to youtube_dl supported datetime format + timestamp = unified_timestamp(media_info.get('date').replace('.', '-') + '+02:00') return { - 'id': video_id, - 'title': title, + 'id': str(video_id).decode('utf-8'), + 'title': playlist_item.get('title', 'unknown title'), 'formats': formats, - 'thumbnail': thumbnail, - 'description': description, - 'duration': duration, - 'view_count': view_count, - 'like_count': like_count, + 'thumbnail': self.THUMBNAIL_URL + playlist_item.get('image', '/images/default-img.svg'), + 'description': clean_html(media_info.get('content', 'unknown description')), + 'timestamp': timestamp, + 'tags': [i['name'] for i in media_info.get('tags')] if media_info.get('tags') else [], } From ce2f4bda419e4f4789e959d95abbd630f431ceb3 Mon Sep 17 00:00:00 2001 From: audrius Date: Mon, 16 Sep 2019 17:52:47 -0700 Subject: [PATCH 2/3] fix unicode strings --- youtube_dl/extractor/lrt.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/youtube_dl/extractor/lrt.py b/youtube_dl/extractor/lrt.py index efca98677..cdb09963f 100644 --- a/youtube_dl/extractor/lrt.py +++ b/youtube_dl/extractor/lrt.py @@ -21,10 +21,10 @@ class LRTIE(InfoExtractor): 'info_dict': { 'id': '2000078895', 'ext': 'mp4', - 'title': u'Loterija \u201eKeno Loto\u201c', - 'description': u'Tira\u017eo nr.: 7993.', + 'title': 'Loterija \u201eKeno Loto\u201c', + 'description': 'Tira\u017eo nr.: 7993.', 'timestamp': 1568658420, - 'tags': [u'Loterija \u201eKeno Loto\u201c', u'LRT TELEVIZIJA'], + 'tags': ['Loterija \u201eKeno Loto\u201c', 'LRT TELEVIZIJA'], 'upload_date': '20190916', }, }, { @@ -35,10 +35,10 @@ class LRTIE(InfoExtractor): 'info_dict': { 'id': '2000068931', 'ext': 'm4a', - 'title': u'Vakaro pasaka. Bebriukas', - 'description': u'Est\u0173 pasaka \u201eBebriukas\u201d. Skaito aktorius Antanas \u0160urna.', + 'title': 'Vakaro pasaka. Bebriukas', + 'description': 'Est\u0173 pasaka \u201eBebriukas\u201d. Skaito aktorius Antanas \u0160urna.', 'timestamp': 1558461780, - 'tags': [u'LRT RADIJAS', u'Vakaro pasaka', u'Bebriukas'], + 'tags': ['LRT RADIJAS', 'Vakaro pasaka', 'Bebriukas'], 'upload_date': '20190521', }, }] From edc81bf505ff1a2c7cabd1a001c721fc3828e94a Mon Sep 17 00:00:00 2001 From: audrius Date: Tue, 10 Mar 2020 16:54:20 -0700 Subject: [PATCH 3/3] Addressing code review feedback --- youtube_dl/extractor/lrt.py | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/youtube_dl/extractor/lrt.py b/youtube_dl/extractor/lrt.py index cdb09963f..b87f6e377 100644 --- a/youtube_dl/extractor/lrt.py +++ b/youtube_dl/extractor/lrt.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals from .common import InfoExtractor +from ..compat import compat_str from ..utils import ( unified_timestamp, clean_html, @@ -17,7 +18,7 @@ class LRTIE(InfoExtractor): # m3u8 download 'url': 'https://www.lrt.lt/mediateka/irasas/2000078895/loterija-keno-loto', # md5 for first 10240 bytes of content - 'md5': '8e6f0121ccacc17d91f98837c66853f0', + 'md5': '484f5f30e3382a1aa444debc9e6256ae', 'info_dict': { 'id': '2000078895', 'ext': 'mp4', @@ -46,35 +47,31 @@ class LRTIE(InfoExtractor): MEDIA_INFO_URL = 'https://www.lrt.lt/servisai/stream_url/vod/media_info/' THUMBNAIL_URL = 'https://www.lrt.lt' QUERY_URL = '/mediateka/irasas/' + TIMEZONE = '+02:00' def _real_extract(self, url): - video_id = self._match_id(url) - media_info = self._download_json(self.MEDIA_INFO_URL, video_id, query={'url': self.QUERY_URL + video_id}) - - video_id = try_get(media_info, lambda x: x.get('id'), int) - if not video_id: - raise ExtractorError("Unable to fetch media info") - - playlist_item = media_info.get('playlist_item', {}) - file = playlist_item.get('file') + id = self._match_id(url) + media_info = self._download_json(self.MEDIA_INFO_URL, id, query={'url': self.QUERY_URL + id}) + playlist_item = try_get(media_info, lambda x: x['playlist_item'], dict) + file = playlist_item['file'] # mandatory for lrt.lt extractor if not file: - raise ExtractorError("Media info did not contain m3u8 file url") + raise ExtractorError("Media info from server did not contain m3u8 file url") if ".m4a" in file: # audio only content formats = [{'url': file, 'vcodec': 'none', 'ext': 'm4a'}] else: - formats = self._extract_m3u8_formats(file, video_id, 'mp4', entry_protocol='m3u8_native') + formats = self._extract_m3u8_formats(file, id, 'mp4', entry_protocol='m3u8_native') - # adjust media datetime to youtube_dl supported datetime format - timestamp = unified_timestamp(media_info.get('date').replace('.', '-') + '+02:00') + # extracting timestamp variable for clarity + timestamp = media_info.get('date', '').replace('.', '-') + self.TIMEZONE return { - 'id': str(video_id).decode('utf-8'), - 'title': playlist_item.get('title', 'unknown title'), + 'id': id, + 'title': playlist_item.get('title') or id, 'formats': formats, 'thumbnail': self.THUMBNAIL_URL + playlist_item.get('image', '/images/default-img.svg'), - 'description': clean_html(media_info.get('content', 'unknown description')), - 'timestamp': timestamp, - 'tags': [i['name'] for i in media_info.get('tags')] if media_info.get('tags') else [], + 'description': clean_html(try_get(media_info, lambda x: x['content'], compat_str)), + 'timestamp': unified_timestamp(timestamp) if timestamp != self.TIMEZONE else None, + 'tags': [i.get('name') for i in media_info.get('tags', [{}]) if i.get('name')], }