refactor a bit

This commit is contained in:
arichi 2016-12-06 21:33:30 +08:00
parent ac6e69cde4
commit 6033d40011

View File

@ -12,7 +12,6 @@ from ..utils import (
float_or_none, float_or_none,
parse_duration, parse_duration,
str_to_int, str_to_int,
urlencode_postdata,
) )
@ -60,11 +59,13 @@ class PandoraTVIE(InfoExtractor):
continue continue
post_data = ('prgid=%s&runtime=%s&vod_url=%s' % (video_id, info.get('runtime'), format_url)).encode() post_data = ('prgid=%s&runtime=%s&vod_url=%s' % (video_id, info.get('runtime'), format_url)).encode()
ret = compat_urllib_request.urlopen("http://m.pandora.tv/?c=api&m=play_url", data=post_data).read() data = compat_urllib_request.urlopen("http://m.pandora.tv/?c=api&m=play_url", data=post_data).read()
encoding = self._guess_encoding_from_content('json', ret) encoding = self._guess_encoding_from_content('json', data)
ret = self._parse_json(ret.decode(encoding, errors='ignore'), video_id) play_url = self._parse_json(data.decode(encoding, errors='ignore'), video_id)
format_url = ret['url'] format_url = play_url.get('url')
if not format_url:
continue
formats.append({ formats.append({
'format_id': '%sp' % height, 'format_id': '%sp' % height,
'url': format_url, 'url': format_url,