[shahid] Improve and simplify

This commit is contained in:
Sergey M․ 2015-08-15 18:13:37 +06:00
parent 11bed5827d
commit c576ef1e7c

View file

@ -2,17 +2,17 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import compat_urllib_parse
from ..utils import ( from ..utils import (
js_to_json,
ExtractorError, ExtractorError,
int_or_none int_or_none,
parse_iso8601,
) )
class ShahidIE(InfoExtractor): class ShahidIE(InfoExtractor):
_VALID_URL = r'https?://shahid\.mbc\.net/ar/episode/(?P<id>\d+)/?' _VALID_URL = r'https?://shahid\.mbc\.net/ar/episode/(?P<id>\d+)/?'
_TESTS = [ _TESTS = [{
{
'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', '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': { 'info_dict': {
'id': '90574', 'id': '90574',
@ -20,72 +20,88 @@ class ShahidIE(InfoExtractor):
'title': 'الملك عبدالله الإنسان الموسم 1 كليب 3', 'title': 'الملك عبدالله الإنسان الموسم 1 كليب 3',
'description': 'الفيلم الوثائقي - الملك عبد الله الإنسان', 'description': 'الفيلم الوثائقي - الملك عبد الله الإنسان',
'duration': 2972, 'duration': 2972,
'timestamp': 1422057420,
'upload_date': '20150123',
}, },
'params': { 'params': {
# m3u8 download # m3u8 download
'skip_download': True, 'skip_download': True,
} }
}, }, {
{
# shahid plus subscriber only # 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', '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 'only_matching': True
} }]
]
_api_vars = { def _handle_error(self, response):
if not isinstance(response, dict):
return
error = response.get('error')
if error:
raise ExtractorError(
'%s returned error: %s' % (self.IE_NAME, '\n'.join(error.values())),
expected=True)
def _download_json(self, url, video_id, note='Downloading JSON metadata'):
response = super(ShahidIE, self)._download_json(url, video_id, note)['data']
self._handle_error(response)
return response
def _real_extract(self, url):
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
api_vars = {
'id': video_id,
'type': 'player', 'type': 'player',
'url': 'http://api.shahid.net/api/v1_1', 'url': 'http://api.shahid.net/api/v1_1',
'playerType': 'episode', 'playerType': 'episode',
} }
def _real_extract(self, url): flashvars = self._search_regex(
video_id = self._match_id(url) r'var\s+flashvars\s*=\s*({[^}]+})', webpage, 'flashvars', default=None)
webpage = self._download_webpage(url, video_id) if flashvars:
for key in api_vars.keys():
value = self._search_regex(
r'\b%s\s*:\s*(?P<q>["\'])(?P<value>.+?)(?P=q)' % key,
flashvars, 'type', default=None, group='value')
if value:
api_vars[key] = value
player_info = '' player = self._download_json(
flash_vars = self._search_regex('var flashvars = ({[^}]+})', webpage, 'flashvars', None) 'https://shahid.mbc.net/arContent/getPlayerContent-param-.id-%s.type-%s.html'
if flash_vars is not None: % (video_id, api_vars['type']), video_id, 'Downloading player JSON')
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( formats = self._extract_m3u8_formats(player['url'], video_id, 'mp4')
'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( video = self._download_json(
self._api_vars['url'] + '/' + self._api_vars['playerType'] + '/' + video_id + '?apiKey=sh%40hid0nlin3&hash=b2wMCTHpSmyxGqQjJFOycRmLSex%2BBpTK%2Fooxy6vHaqs%3D', '%s/%s/%s?%s' % (
video_id api_vars['url'], api_vars['playerType'], api_vars['id'],
)['data'] compat_urllib_parse.urlencode({
if video_info.get('error'): 'apiKey': 'sh@hid0nlin3',
for error in video_info['error']: 'hash': 'b2wMCTHpSmyxGqQjJFOycRmLSex+BpTK/ooxy6vHaqs=',
raise ExtractorError(error) }).encode('utf-8')),
video_info = video_info[self._api_vars['playerType']] video_id, 'Downloading video JSON')
title = video_info['title']
thumbnail = video_info.get('thumbnailUrl') video = video[api_vars['playerType']]
categories = [category['name'] for category in video_info.get('genres')]
description = video_info.get('description') title = video['title']
duration = int_or_none(video_info.get('duration')) description = video.get('description')
thumbnail = video.get('thumbnailUrl')
duration = int_or_none(video.get('duration'))
timestamp = parse_iso8601(video.get('referenceDate'))
categories = [
category['name']
for category in video.get('genres', []) if 'name' in category]
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': title,
'thumbnail': thumbnail,
'categories': categories,
'description': description, 'description': description,
'thumbnail': thumbnail,
'duration': duration, 'duration': duration,
'timestamp': timestamp,
'categories': categories,
'formats': formats, 'formats': formats,
} }