New upstream version 2017.02.24.1

[youtubedl] / youtube_dl / extractor / pandoratv.py

diff --git a/youtube_dl/extractor/pandoratv.py b/youtube_dl/extractor/pandoratv.py
index 8d49f5c4aff04954e773b9eb575af912130a8401..89c95fffb6e6ca7279d927424c19be9325e2ac4d 100644 (file)
--- a/youtube_dl/extractor/pandoratv.py
+++ b/youtube_dl/extractor/pandoratv.py
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# coding: utf-8

 from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from __future__ import unicode_literals
 
 from .common import InfoExtractor


@@ -11,6 +11,7 @@ from ..utils import (
     float_or_none,
     parse_duration,
     str_to_int,
     float_or_none,
     parse_duration,
     str_to_int,

+    urlencode_postdata,

 )
 
 
 )
 
 


@@ -25,7 +26,7 @@ class PandoraTVIE(InfoExtractor):
             'ext': 'flv',
             'title': '頭を撫でてくれる？',
             'description': '頭を撫でてくれる？',
             'ext': 'flv',
             'title': '頭を撫でてくれる？',
             'description': '頭を撫でてくれる？',

-            'thumbnail': 're:^https?://.*\.jpg$',
+            'thumbnail': r're:^https?://.*\.jpg$',

             'duration': 39,
             'upload_date': '20151218',
             'uploader': 'カワイイ動物まとめ',
             'duration': 39,
             'upload_date': '20151218',
             'uploader': 'カワイイ動物まとめ',


@@ -56,6 +57,22 @@ class PandoraTVIE(InfoExtractor):
                 r'^v(\d+)[Uu]rl$', format_id, 'height', default=None)
             if not height:
                 continue
                 r'^v(\d+)[Uu]rl$', format_id, 'height', default=None)
             if not height:
                 continue

+
+            play_url = self._download_json(
+                'http://m.pandora.tv/?c=api&m=play_url', video_id,
+                data=urlencode_postdata({
+                    'prgid': video_id,
+                    'runtime': info.get('runtime'),
+                    'vod_url': format_url,
+                }),
+                headers={
+                    'Origin': url,
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                })
+            format_url = play_url.get('url')
+            if not format_url:
+                continue
+

             formats.append({
                 'format_id': '%sp' % height,
                 'url': format_url,
             formats.append({
                 'format_id': '%sp' % height,
                 'url': format_url,