X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fshahid.py;h=39914018999a89bc9b56a1a8ac59d025b2d38559;hb=59e89e62d7b45554cef502dc4986f35618110679;hp=b3b45da2412cc15218d1db53373dbf89cf12d440;hpb=dfaba1ab9586a7c47017bd897ffda0b795a1d27e;p=youtube-dl

diff --git a/youtube_dl/extractor/shahid.py b/youtube_dl/extractor/shahid.py
index b3b45da24..399140189 100644
--- a/youtube_dl/extractor/shahid.py
+++ b/youtube_dl/extractor/shahid.py
@@ -1,3 +1,6 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
 from .common import InfoExtractor
 from ..utils import (
     js_to_json,
@@ -5,17 +8,18 @@ from ..utils import (
     int_or_none
 )
 
+
 class ShahidIE(InfoExtractor):
     _VALID_URL = r'https?://shahid\.mbc\.net/ar/episode/(?P<id>\d+)/?'
     _TESTS = [
         {
-            'url': 'https://shahid.mbc.net/ar/episode/108084/%D8%AE%D9%88%D8%A7%D8%B7%D8%B1-%D8%A7%D9%84%D9%85%D9%88%D8%B3%D9%85-11-%D8%A7%D9%84%D8%AD%D9%84%D9%82%D8%A9-1.html',
+            'url': 'https://shahid.mbc.net/ar/episode/90574/%D8%A7%D9%84%D9%85%D9%84%D9%83-%D8%B9%D8%A8%D8%AF%D8%A7%D9%84%D9%84%D9%87-%D8%A7%D9%84%D8%A5%D9%86%D8%B3%D8%A7%D9%86-%D8%A7%D9%84%D9%85%D9%88%D8%B3%D9%85-1-%D9%83%D9%84%D9%8A%D8%A8-3.html',
             'info_dict': {
-                'id': '108084',
+                'id': '90574',
                 'ext': 'm3u8',
-                'title': 'خواطر الموسم 11 الحلقة 1',
-                'description': 'بسم الله',
-                'duration': 1166,
+                'title': 'الملك عبدالله الإنسان الموسم 1 كليب 3',
+                'description': 'الفيلم الوثائقي - الملك عبد الله الإنسان',
+                'duration': 2972,
             },
             'params': {
                 # m3u8 download
@@ -23,51 +27,59 @@ class ShahidIE(InfoExtractor):
             }
         },
         {
-            #shahid plus subscriber only
-            'url': 'https://shahid.mbc.net/ar/series/90497/%D9%85%D8%B1%D8%A7%D9%8A%D8%A7-2011.html',
+            # shahid plus subscriber only
+            'url': 'https://shahid.mbc.net/ar/episode/90511/%D9%85%D8%B1%D8%A7%D9%8A%D8%A7-2011-%D8%A7%D9%84%D9%85%D9%88%D8%B3%D9%85-1-%D8%A7%D9%84%D8%AD%D9%84%D9%82%D8%A9-1.html',
             'only_matching': True
         }
     ]
 
+    _api_vars = {
+        'type': 'player',
+        'url': 'http://api.shahid.net/api/v1_1',
+        'playerType': 'episode',
+    }
+
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
+
         player_info = ''
-        for line in self._search_regex( 'var flashvars = ({[^}]+})', webpage, 'flashvars').splitlines():
-            if '+' not in line and '(' not in line and ')' not in line:
-                player_info += line
-        player_info = self._parse_json(js_to_json(player_info), video_id)
-        video_id = player_info['id']
-        player_type = player_info['playerType']
+        flash_vars = self._search_regex('var flashvars = ({[^}]+})', webpage, 'flashvars', None)
+        if flash_vars is not None:
+            for line in flash_vars.splitlines():
+                if '+' not in line and '(' not in line and ')' not in line:
+                    player_info += line
+            player_info = self._parse_json(player_info, video_id, js_to_json, False)
+            if player_info is not None:
+                for key in self._api_vars:
+                    if key in player_info:
+                        self._api_vars[key] = player_info[key]
+
+        player_json_data = self._download_json(
+            'https://shahid.mbc.net/arContent/getPlayerContent-param-.id-' + video_id + '.type-' + self._api_vars['type'] + '.html',
+            video_id
+        )['data']
+        if 'url' in player_json_data:
+            m3u8_url = player_json_data['url']
+        else:
+            for error in player_json_data['error'].values():
+                raise ExtractorError(error)
+        formats = self._extract_m3u8_formats(m3u8_url, video_id)
 
         video_info = self._download_json(
-            player_info['url'] + '/' + player_type + '/' + video_id + 
-                '?apiKey=sh%40hid0nlin3&hash=b2wMCTHpSmyxGqQjJFOycRmLSex%2BBpTK%2Fooxy6vHaqs%3D',
+            self._api_vars['url'] + '/' + self._api_vars['playerType'] + '/' + video_id + '?apiKey=sh%40hid0nlin3&hash=b2wMCTHpSmyxGqQjJFOycRmLSex%2BBpTK%2Fooxy6vHaqs%3D',
             video_id
         )['data']
-        if video_info['error']:
+        if video_info.get('error'):
             for error in video_info['error']:
                 raise ExtractorError(error)
-        video_info = video_info[player_type]
-        if video_info.get('availabilities').get('plus'):
-            raise ExtractorError('plus members only')
+        video_info = video_info[self._api_vars['playerType']]
         title = video_info['title']
         thumbnail = video_info.get('thumbnailUrl')
         categories = [category['name'] for category in video_info.get('genres')]
         description = video_info.get('description')
         duration = int_or_none(video_info.get('duration'))
 
-        player_json_data = self._download_json(
-            'https://shahid.mbc.net/arContent/getPlayerContent-param-.id-' + video_id + '.type-' + player_info['type'] + '.html',
-            video_id
-        )['data']
-        if 'url' in player_json_data:
-            m3u8_url = player_json_data['url']
-        else:
-            for error in player_json_data['error'].values():
-                raise ExtractorError(error)
-            return
-        formats = self._extract_m3u8_formats(m3u8_url, video_id)
         return {
             'id': video_id,
             'title': title,