[ie/abc.net.au:iview] Improve episode extraction (#8201)
Authored by: xofe
This commit is contained in:
xofe
GitHub
parent
f980df734c
commit
a9efb4b8d7
1 changed files with 88 additions and 2 deletions
|
|
@ -181,18 +181,102 @@ class ABCIViewIE(InfoExtractor):
|
||||||
_GEO_COUNTRIES = ['AU']
|
_GEO_COUNTRIES = ['AU']
|
||||||
|
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
|
'url': 'https://iview.abc.net.au/show/utopia/series/1/video/CO1211V001S00',
|
||||||
|
'md5': '52a942bfd7a0b79a6bfe9b4ce6c9d0ed',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'CO1211V001S00',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'title': 'Series 1 Ep 1 Wood For The Trees',
|
||||||
|
'series': 'Utopia',
|
||||||
|
'description': 'md5:0cfb2c183c1b952d1548fd65c8a95c00',
|
||||||
|
'upload_date': '20230726',
|
||||||
|
'uploader_id': 'abc1',
|
||||||
|
'series_id': 'CO1211V',
|
||||||
|
'episode_id': 'CO1211V001S00',
|
||||||
|
'season_number': 1,
|
||||||
|
'season': 'Season 1',
|
||||||
|
'episode_number': 1,
|
||||||
|
'episode': 'Wood For The Trees',
|
||||||
|
'thumbnail': 'https://cdn.iview.abc.net.au/thumbs/i/co/CO1211V001S00_5ad8353f4df09_1280.jpg',
|
||||||
|
'timestamp': 1690403700,
|
||||||
|
},
|
||||||
|
'params': {
|
||||||
|
'skip_download': True,
|
||||||
|
},
|
||||||
|
}, {
|
||||||
|
'note': 'No episode name',
|
||||||
'url': 'https://iview.abc.net.au/show/gruen/series/11/video/LE1927H001S00',
|
'url': 'https://iview.abc.net.au/show/gruen/series/11/video/LE1927H001S00',
|
||||||
'md5': '67715ce3c78426b11ba167d875ac6abf',
|
'md5': '67715ce3c78426b11ba167d875ac6abf',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': 'LE1927H001S00',
|
'id': 'LE1927H001S00',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': "Series 11 Ep 1",
|
'title': 'Series 11 Ep 1',
|
||||||
'series': "Gruen",
|
'series': 'Gruen',
|
||||||
'description': 'md5:52cc744ad35045baf6aded2ce7287f67',
|
'description': 'md5:52cc744ad35045baf6aded2ce7287f67',
|
||||||
'upload_date': '20190925',
|
'upload_date': '20190925',
|
||||||
'uploader_id': 'abc1',
|
'uploader_id': 'abc1',
|
||||||
|
'series_id': 'LE1927H',
|
||||||
|
'episode_id': 'LE1927H001S00',
|
||||||
|
'season_number': 11,
|
||||||
|
'season': 'Season 11',
|
||||||
|
'episode_number': 1,
|
||||||
|
'episode': 'Episode 1',
|
||||||
|
'thumbnail': 'https://cdn.iview.abc.net.au/thumbs/i/le/LE1927H001S00_5d954fbd79e25_1280.jpg',
|
||||||
'timestamp': 1569445289,
|
'timestamp': 1569445289,
|
||||||
},
|
},
|
||||||
|
'expected_warnings': ['Ignoring subtitle tracks found in the HLS manifest'],
|
||||||
|
'params': {
|
||||||
|
'skip_download': True,
|
||||||
|
},
|
||||||
|
}, {
|
||||||
|
'note': 'No episode number',
|
||||||
|
'url': 'https://iview.abc.net.au/show/four-corners/series/2022/video/NC2203H039S00',
|
||||||
|
'md5': '77cb7d8434440e3b28fbebe331c2456a',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'NC2203H039S00',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'title': 'Series 2022 Locking Up Kids',
|
||||||
|
'series': 'Four Corners',
|
||||||
|
'description': 'md5:54829ca108846d1a70e1fcce2853e720',
|
||||||
|
'upload_date': '20221114',
|
||||||
|
'uploader_id': 'abc1',
|
||||||
|
'series_id': 'NC2203H',
|
||||||
|
'episode_id': 'NC2203H039S00',
|
||||||
|
'season_number': 2022,
|
||||||
|
'season': 'Season 2022',
|
||||||
|
'episode_number': None,
|
||||||
|
'episode': 'Locking Up Kids',
|
||||||
|
'thumbnail': 'https://cdn.iview.abc.net.au/thumbs/i/nc/NC2203H039S00_636d8a0944a22_1920.jpg',
|
||||||
|
'timestamp': 1668460497,
|
||||||
|
|
||||||
|
},
|
||||||
|
'expected_warnings': ['Ignoring subtitle tracks found in the HLS manifest'],
|
||||||
|
'params': {
|
||||||
|
'skip_download': True,
|
||||||
|
},
|
||||||
|
}, {
|
||||||
|
'note': 'No episode name or number',
|
||||||
|
'url': 'https://iview.abc.net.au/show/landline/series/2021/video/RF2004Q043S00',
|
||||||
|
'md5': '2e17dec06b13cc81dc119d2565289396',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'RF2004Q043S00',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'title': 'Series 2021',
|
||||||
|
'series': 'Landline',
|
||||||
|
'description': 'md5:c9f30d9c0c914a7fd23842f6240be014',
|
||||||
|
'upload_date': '20211205',
|
||||||
|
'uploader_id': 'abc1',
|
||||||
|
'series_id': 'RF2004Q',
|
||||||
|
'episode_id': 'RF2004Q043S00',
|
||||||
|
'season_number': 2021,
|
||||||
|
'season': 'Season 2021',
|
||||||
|
'episode_number': None,
|
||||||
|
'episode': None,
|
||||||
|
'thumbnail': 'https://cdn.iview.abc.net.au/thumbs/i/rf/RF2004Q043S00_61a950639dbc0_1920.jpg',
|
||||||
|
'timestamp': 1638710705,
|
||||||
|
|
||||||
|
},
|
||||||
|
'expected_warnings': ['Ignoring subtitle tracks found in the HLS manifest'],
|
||||||
'params': {
|
'params': {
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
|
|
@ -254,6 +338,8 @@ class ABCIViewIE(InfoExtractor):
|
||||||
'episode_number': int_or_none(self._search_regex(
|
'episode_number': int_or_none(self._search_regex(
|
||||||
r'\bEp\s+(\d+)\b', title, 'episode number', default=None)),
|
r'\bEp\s+(\d+)\b', title, 'episode number', default=None)),
|
||||||
'episode_id': house_number,
|
'episode_id': house_number,
|
||||||
|
'episode': self._search_regex(
|
||||||
|
r'^(?:Series\s+\d+)?\s*(?:Ep\s+\d+)?\s*(.*)$', title, 'episode', default='') or None,
|
||||||
'uploader_id': video_params.get('channel'),
|
'uploader_id': video_params.get('channel'),
|
||||||
'formats': formats,
|
'formats': formats,
|
||||||
'subtitles': subtitles,
|
'subtitles': subtitles,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue