mirror of
				https://github.com/yt-dlp/yt-dlp.git
				synced 2025-10-31 14:45:14 +00:00 
			
		
		
		
	[rte] Add support for new API endpoint (closes #18206)
This commit is contained in:
		| @@ -8,7 +8,10 @@ from ..compat import compat_HTTPError | |||||||
| from ..utils import ( | from ..utils import ( | ||||||
|     float_or_none, |     float_or_none, | ||||||
|     parse_iso8601, |     parse_iso8601, | ||||||
|  |     str_or_none, | ||||||
|  |     try_get, | ||||||
|     unescapeHTML, |     unescapeHTML, | ||||||
|  |     url_or_none, | ||||||
|     ExtractorError, |     ExtractorError, | ||||||
| ) | ) | ||||||
|  |  | ||||||
| @@ -17,11 +20,20 @@ class RteBaseIE(InfoExtractor): | |||||||
|     def _real_extract(self, url): |     def _real_extract(self, url): | ||||||
|         item_id = self._match_id(url) |         item_id = self._match_id(url) | ||||||
|  |  | ||||||
|  |         info_dict = {} | ||||||
|  |         formats = [] | ||||||
|  |  | ||||||
|  |         ENDPOINTS = ( | ||||||
|  |             'https://feeds.rasset.ie/rteavgen/player/playlist?type=iptv&format=json&showId=', | ||||||
|  |             'http://www.rte.ie/rteavgen/getplaylist/?type=web&format=json&id=', | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |         for num, ep_url in enumerate(ENDPOINTS, start=1): | ||||||
|             try: |             try: | ||||||
|             json_string = self._download_json( |                 data = self._download_json(ep_url + item_id, item_id) | ||||||
|                 'http://www.rte.ie/rteavgen/getplaylist/?type=web&format=json&id=' + item_id, |  | ||||||
|                 item_id) |  | ||||||
|             except ExtractorError as ee: |             except ExtractorError as ee: | ||||||
|  |                 if num < len(ENDPOINTS) or formats: | ||||||
|  |                     continue | ||||||
|                 if isinstance(ee.cause, compat_HTTPError) and ee.cause.code == 404: |                 if isinstance(ee.cause, compat_HTTPError) and ee.cause.code == 404: | ||||||
|                     error_info = self._parse_json(ee.cause.read().decode(), item_id, fatal=False) |                     error_info = self._parse_json(ee.cause.read().decode(), item_id, fatal=False) | ||||||
|                     if error_info: |                     if error_info: | ||||||
| @@ -31,16 +43,28 @@ class RteBaseIE(InfoExtractor): | |||||||
|                 raise |                 raise | ||||||
|  |  | ||||||
|             # NB the string values in the JSON are stored using XML escaping(!) |             # NB the string values in the JSON are stored using XML escaping(!) | ||||||
|         show = json_string['shows'][0] |             show = try_get(data, lambda x: x['shows'][0], dict) | ||||||
|  |             if not show: | ||||||
|  |                 continue | ||||||
|  |  | ||||||
|  |             if not info_dict: | ||||||
|                 title = unescapeHTML(show['title']) |                 title = unescapeHTML(show['title']) | ||||||
|                 description = unescapeHTML(show.get('description')) |                 description = unescapeHTML(show.get('description')) | ||||||
|                 thumbnail = show.get('thumbnail') |                 thumbnail = show.get('thumbnail') | ||||||
|                 duration = float_or_none(show.get('duration'), 1000) |                 duration = float_or_none(show.get('duration'), 1000) | ||||||
|                 timestamp = parse_iso8601(show.get('published')) |                 timestamp = parse_iso8601(show.get('published')) | ||||||
|  |                 info_dict = { | ||||||
|  |                     'id': item_id, | ||||||
|  |                     'title': title, | ||||||
|  |                     'description': description, | ||||||
|  |                     'thumbnail': thumbnail, | ||||||
|  |                     'timestamp': timestamp, | ||||||
|  |                     'duration': duration, | ||||||
|  |                 } | ||||||
|  |  | ||||||
|         mg = show['media:group'][0] |             mg = try_get(show, lambda x: x['media:group'][0], dict) | ||||||
|  |             if not mg: | ||||||
|         formats = [] |                 continue | ||||||
|  |  | ||||||
|             if mg.get('url'): |             if mg.get('url'): | ||||||
|                 m = re.match(r'(?P<url>rtmpe?://[^/]+)/(?P<app>.+)/(?P<playpath>mp4:.*)', mg['url']) |                 m = re.match(r'(?P<url>rtmpe?://[^/]+)/(?P<app>.+)/(?P<playpath>mp4:.*)', mg['url']) | ||||||
| @@ -65,17 +89,18 @@ class RteBaseIE(InfoExtractor): | |||||||
|                     mg['hds_server'] + mg['hds_url'], item_id, |                     mg['hds_server'] + mg['hds_url'], item_id, | ||||||
|                     f4m_id='hds', fatal=False)) |                     f4m_id='hds', fatal=False)) | ||||||
|  |  | ||||||
|  |             mg_rte_server = str_or_none(mg.get('rte:server')) | ||||||
|  |             mg_url = str_or_none(mg.get('url')) | ||||||
|  |             if mg_rte_server and mg_url: | ||||||
|  |                 hds_url = url_or_none(mg_rte_server + mg_url) | ||||||
|  |                 if hds_url: | ||||||
|  |                     formats.extend(self._extract_f4m_formats( | ||||||
|  |                         hds_url, item_id, f4m_id='hds', fatal=False)) | ||||||
|  |  | ||||||
|         self._sort_formats(formats) |         self._sort_formats(formats) | ||||||
|  |  | ||||||
|         return { |         info_dict['formats'] = formats | ||||||
|             'id': item_id, |         return info_dict | ||||||
|             'title': title, |  | ||||||
|             'description': description, |  | ||||||
|             'thumbnail': thumbnail, |  | ||||||
|             'timestamp': timestamp, |  | ||||||
|             'duration': duration, |  | ||||||
|             'formats': formats, |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class RteIE(RteBaseIE): | class RteIE(RteBaseIE): | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Sergey M․
					Sergey M․