X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ffxnetworks.py;h=629897317be5fbe316639856cec73662c1f8149c;hb=05bddcc512cd5058f1af1d5985979b70bdcf4711;hp=70bc186a33a3f74a2d06a3fdb77649db3c24382c;hpb=bf90c46790bac92e8a61ee0514cf3c41a8c048e9;p=youtube-dl

diff --git a/youtube_dl/extractor/fxnetworks.py b/youtube_dl/extractor/fxnetworks.py
index 70bc186a3..629897317 100644
--- a/youtube_dl/extractor/fxnetworks.py
+++ b/youtube_dl/extractor/fxnetworks.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-from .adobepass import AdobePass
+from .adobepass import AdobePassIE
 from ..utils import (
     update_url_query,
     extract_attributes,
@@ -10,15 +10,35 @@ from ..utils import (
 )
 
 
-class FXNetworksIE(AdobePass):
-    _VALID_URL = r'https?://(?:www\.)?fxnetworks\.com/video/(?P<id>\d+)'
+class FXNetworksIE(AdobePassIE):
+    _VALID_URL = r'https?://(?:www\.)?(?:fxnetworks|simpsonsworld)\.com/video/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'http://www.fxnetworks.com/video/719841347694',
+        'md5': '1447d4722e42ebca19e5232ab93abb22',
+        'info_dict': {
+            'id': '719841347694',
+            'ext': 'mp4',
+            'title': 'Vanpage',
+            'description': 'F*ck settling down. You\'re the Worst returns for an all new season August 31st on FXX.',
+            'age_limit': 14,
+            'uploader': 'NEWA-FNG-FX',
+            'upload_date': '20160706',
+            'timestamp': 1467844741,
+        },
+        'add_ie': ['ThePlatform'],
+    }, {
+        'url': 'http://www.simpsonsworld.com/video/716094019682',
+        'only_matching': True,
+    }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
+        if 'The content you are trying to access is not available in your region.' in webpage:
+            self.raise_geo_restricted()
         video_data = extract_attributes(self._search_regex(
             r'(<a.+?rel="http://link\.theplatform\.com/s/.+?</a>)', webpage, 'video data'))
-        player_type = self._search_regex(r'playerType\s*=\s*[\'"]([^\'"]+)', webpage, 'player type', fatal=False)
+        player_type = self._search_regex(r'playerType\s*=\s*[\'"]([^\'"]+)', webpage, 'player type', default=None)
         release_url = video_data['rel']
         title = video_data['data-title']
         rating = video_data.get('data-rating')
@@ -42,6 +62,7 @@ class FXNetworksIE(AdobePass):
         return {
             '_type': 'url_transparent',
             'id': video_id,
+            'title': title,
             'url': smuggle_url(update_url_query(release_url, query), {'force_smil_url': True}),
             'thumbnail': video_data.get('data-large-thumb'),
             'age_limit': parse_age_limit(rating),