projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
94aa25b
)
[tunein] Use station API
author
Naglis Jonaitis
<njonaitis@gmail.com>
Mon, 1 Dec 2014 16:10:04 +0000
(18:10 +0200)
committer
Naglis Jonaitis
<njonaitis@gmail.com>
Mon, 1 Dec 2014 16:10:15 +0000
(18:10 +0200)
youtube_dl/extractor/tunein.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/tunein.py
b/youtube_dl/extractor/tunein.py
index 8c29f16343d52e28fade06232390c46e16c31fd3..4ce5aeeba242b94b78d71e3c9d033aa318b588fb 100644
(file)
--- a/
youtube_dl/extractor/tunein.py
+++ b/
youtube_dl/extractor/tunein.py
@@
-19,6
+19,7
@@
class TuneInIE(InfoExtractor):
|tun\.in/(?P<redirect_id>[A-Za-z0-9]+)
)
'''
|tun\.in/(?P<redirect_id>[A-Za-z0-9]+)
)
'''
+ _API_URL_TEMPLATE = 'http://tunein.com/tuner/tune/?stationId={0:}&tuneType=Station'
_INFO_DICT = {
'id': '34682',
_INFO_DICT = {
'id': '34682',
@@
-56,13
+57,10
@@
class TuneInIE(InfoExtractor):
mobj = re.match(self._VALID_URL, url)
station_id = mobj.group('id')
mobj = re.match(self._VALID_URL, url)
station_id = mobj.group('id')
- webpage = self._download_webpage(
- url, station_id, note='Downloading station webpage')
+ station_info = self._download_json(
+ self._API_URL_TEMPLATE.format(station_id),
+ station_id, note='Downloading station JSON')
- payload = self._html_search_regex(
- r'(?m)TuneIn\.payload\s*=\s*(\{[^$]+?)$', webpage, 'JSON data')
- json_data = json.loads(payload)
- station_info = json_data['Station']['broadcast']
title = station_info['Title']
thumbnail = station_info.get('Logo')
location = station_info.get('Location')
title = station_info['Title']
thumbnail = station_info.get('Logo')
location = station_info.get('Location')