Merge pull request #1 from e7appew/python3

[youtubedl] / youtube_dl / extractor / fox.py

diff --git a/youtube_dl/extractor/fox.py b/youtube_dl/extractor/fox.py
index fa05af50d99ba1e580ba631717515f184bc838de..9f406b17eebfab6248f0a6e0d4722151abd7add9 100644 (file)
--- a/youtube_dl/extractor/fox.py
+++ b/youtube_dl/extractor/fox.py
@@ -2,7 +2,10 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from __future__ import unicode_literals
 
 from .common import InfoExtractor

-from ..utils import smuggle_url
+from ..utils import (
+    smuggle_url,
+    update_url_query,
+)

 
 
 class FOXIE(InfoExtractor):
 
 
 class FOXIE(InfoExtractor):


@@ -16,6 +19,9 @@ class FOXIE(InfoExtractor):
             'title': 'Official Trailer: Gotham',
             'description': 'Tracing the rise of the great DC Comics Super-Villains and vigilantes, Gotham reveals an entirely new chapter that has never been told.',
             'duration': 129,
             'title': 'Official Trailer: Gotham',
             'description': 'Tracing the rise of the great DC Comics Super-Villains and vigilantes, Gotham reveals an entirely new chapter that has never been told.',
             'duration': 129,

+            'timestamp': 1400020798,
+            'upload_date': '20140513',
+            'uploader': 'NEWA-FNG-FOXCOM',

         },
         'add_ie': ['ThePlatform'],
     }
         },
         'add_ie': ['ThePlatform'],
     }


@@ -26,11 +32,12 @@ class FOXIE(InfoExtractor):
 
         release_url = self._parse_json(self._search_regex(
             r'"fox_pdk_player"\s*:\s*({[^}]+?})', webpage, 'fox_pdk_player'),
 
         release_url = self._parse_json(self._search_regex(
             r'"fox_pdk_player"\s*:\s*({[^}]+?})', webpage, 'fox_pdk_player'),

-            video_id)['release_url'] + '&switch=http'
+            video_id)['release_url']

 
         return {
             '_type': 'url_transparent',
             'ie_key': 'ThePlatform',
 
         return {
             '_type': 'url_transparent',
             'ie_key': 'ThePlatform',

-            'url': smuggle_url(release_url, {'force_smil_url': True}),
+            'url': smuggle_url(update_url_query(
+                release_url, {'switch': 'http'}), {'force_smil_url': True}),

             'id': video_id,
         }
             'id': video_id,
         }