diff options
Diffstat (limited to 'youtube_dl/extractor')
| -rw-r--r-- | youtube_dl/extractor/pandoratv.py | 60 |
1 files changed, 40 insertions, 20 deletions
diff --git a/youtube_dl/extractor/pandoratv.py b/youtube_dl/extractor/pandoratv.py index a0a0c114a..34cede4c1 100644 --- a/youtube_dl/extractor/pandoratv.py +++ b/youtube_dl/extractor/pandoratv.py @@ -2,28 +2,36 @@ from __future__ import unicode_literals from .common import InfoExtractor - from ..compat import ( + compat_str, compat_urlparse, ) from ..utils import ( ExtractorError, + float_or_none, + parse_duration, + str_to_int, ) class PandoraTVIE(InfoExtractor): - _VALID_URL = r'http://(?:.+?\.)?channel.pandora.tv/channel/video.ptv\?' - _TESTS = [{ + _VALID_URL = r'https?://(?:.+?\.)?channel\.pandora\.tv/channel/video\.ptv\?' + _TEST = { 'url': 'http://jp.channel.pandora.tv/channel/video.ptv?c1=&prgid=53294230&ch_userid=mikakim&ref=main&lot=cate_01_2', 'info_dict': { - 'description': '\u982d\u3092\u64ab\u3067\u3066\u304f\u308c\u308b\uff1f', - 'ext': 'mp4', 'id': '53294230', - 'title': '\u982d\u3092\u64ab\u3067\u3066\u304f\u308c\u308b\uff1f', + 'ext': 'flv', + 'title': '頭を撫でてくれる？', + 'description': '頭を撫でてくれる？', + 'thumbnail': 're:^https?://.*\.jpg$', + 'duration': 39, 'upload_date': '20151218', + 'uploader': 'カワイイ動物まとめ', + 'uploader_id': 'mikakim', + 'view_count': int, + 'like_count': int, } - }] - + } def _real_extract(self, url): qs = compat_urlparse.parse_qs(compat_urlparse.urlparse(url).query) @@ -32,25 +40,37 @@ class PandoraTVIE(InfoExtractor): if any(not f for f in (video_id, user_id,)): raise ExtractorError('Invalid URL', expected=True) - data_url ='http://m.pandora.tv/?c=view&m=viewJsonApi&ch_userid={userid}&prgid={prgid}'.format(userid=user_id,prgid=video_id) - data = self._download_json(data_url, video_id) + data = self._download_json( + 'http://m.pandora.tv/?c=view&m=viewJsonApi&ch_userid=%s&prgid=%s' + % (user_id, video_id), video_id) + info = data['data']['rows']['vod_play_info']['result'] formats = [] - for format_id in sorted([k for k in info if k.startswith('v') and k.endswith('Url') and info[k]]): + for format_id, format_url in info.items(): + if not format_url: + continue + height = self._search_regex( + r'^v(\d+)[Uu]rl$', format_id, 'height', default=None) + if not height: + continue formats.append({ - 'format_id': format_id, - 'url': info[format_id], - 'ext': 'mp4', - 'height': int(format_id[1:-3]), + 'format_id': '%sp' % height, + 'url': format_url, + 'height': int(height), }) + self._sort_formats(formats) return { - 'description': info['body'], - 'thumbnail': info['thumbnail'], - 'formats': formats, 'id': video_id, 'title': info['subject'], - 'upload_date': info['fid'][:8], - 'view_count': info['hit'], + 'description': info.get('body'), + 'thumbnail': info.get('thumbnail') or info.get('poster'), + 'duration': float_or_none(info.get('runtime'), 1000) or parse_duration(info.get('time')), + 'upload_date': info['fid'][:8] if isinstance(info.get('fid'), compat_str) else None, + 'uploader': info.get('nickname'), + 'uploader_id': info.get('upload_userid'), + 'view_count': str_to_int(info.get('hit')), + 'like_count': str_to_int(info.get('likecnt')), + 'formats': formats, } |