1
0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2024-11-23 00:54:31 +01:00

[tunein] Fix generic tunein test and simplify regex

This commit is contained in:
biwubo 2019-03-24 13:32:05 +00:00
parent a5fce76e2f
commit c45f410b3a
2 changed files with 7 additions and 6 deletions

View File

@ -1020,8 +1020,8 @@ class GenericIE(InfoExtractor):
'info_dict': { 'info_dict': {
'id': '204146', 'id': '204146',
'ext': 'mp3', 'ext': 'mp3',
'title': 'CNRV', 'title': 're:CNRV',
'location': 'Paris, France', 'description': 'md5:298ece12650f386bebdf3c3499a4f846',
'is_live': True, 'is_live': True,
}, },
'params': { 'params': {

View File

@ -95,7 +95,7 @@ class TuneInStationIE(TuneInBaseIE):
'url': 'http://tunein.com/radio/Jazz24-885-s34682/', 'url': 'http://tunein.com/radio/Jazz24-885-s34682/',
'info_dict': { 'info_dict': {
'id': '34682', 'id': '34682',
'title': 're:.*Jazz24.*', 'title': 're:Jazz24',
'description': 'md5:c94dad268809130da5c91b0760f366a1', 'description': 'md5:c94dad268809130da5c91b0760f366a1',
'ext': 'mp3' 'ext': 'mp3'
}, },
@ -156,8 +156,9 @@ class TuneInProgramIE(TuneInBaseIE):
for entry in self._process_page(page): for entry in self._process_page(page):
yield entry yield entry
has_more = try_get(page, has_more = try_get(
lambda p: p['Paging']['Next'], compat_str) is not None page,
lambda p: p['Paging']['Next'], compat_str) is not None
if has_more: if has_more:
offset += page['Paging']['ItemCount'] offset += page['Paging']['ItemCount']
@ -201,7 +202,7 @@ class TuneInShortenerIE(InfoExtractor):
'url': 'http://tun.in/ser7s', 'url': 'http://tun.in/ser7s',
'info_dict': { 'info_dict': {
'id': '34682', 'id': '34682',
'title': 're:.*Jazz24.*', 'title': 're:Jazz24',
'description': 'md5:c94dad268809130da5c91b0760f366a1', 'description': 'md5:c94dad268809130da5c91b0760f366a1',
'ext': 'mp3' 'ext': 'mp3'
}, },