mirrors/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-22 22:35:21 +00:00
Code Issues Projects Releases Wiki Activity

[shahid] generic errors handling and check with flake8

Browse Source
This commit is contained in:
remitamine 2015-08-06 19:37:45 +01:00
parent dfaba1ab95
commit 3be3c622dc
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
youtube_dl/extractor/shahid.py
View File

@ -1,3 +1,6 @@
# coding: utf-8
from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
js_to_json, js_to_json,
@ -5,6 +8,7 @@ from ..utils import (
int_or_none int_or_none
) )
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 = [
@ -23,7 +27,7 @@ class ShahidIE(InfoExtractor):
} }
}, },
{ {
#shahid plus subscriber only # shahid plus subscriber only
'url': 'https://shahid.mbc.net/ar/series/90497/%D9%85%D8%B1%D8%A7%D9%8A%D8%A7-2011.html', 'url': 'https://shahid.mbc.net/ar/series/90497/%D9%85%D8%B1%D8%A7%D9%8A%D8%A7-2011.html',
'only_matching': True 'only_matching': True
} }
@ -32,31 +36,15 @@ class ShahidIE(InfoExtractor):
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
player_info = '' player_info = ''
for line in self._search_regex( 'var flashvars = ({[^}]+})', webpage, 'flashvars').splitlines(): for line in self._search_regex('var flashvars = ({[^}]+})', webpage, 'flashvars').splitlines():
if '+' not in line and '(' not in line and ')' not in line: if '+' not in line and '(' not in line and ')' not in line:
player_info += line player_info += line
player_info = self._parse_json(js_to_json(player_info), video_id) player_info = self._parse_json(js_to_json(player_info), video_id)
video_id = player_info['id'] video_id = player_info['id']
player_type = player_info['playerType'] player_type = player_info['playerType']
video_info = self._download_json(
player_info['url'] + '/' + player_type + '/' + video_id +
'?apiKey=sh%40hid0nlin3&hash=b2wMCTHpSmyxGqQjJFOycRmLSex%2BBpTK%2Fooxy6vHaqs%3D',
video_id
)['data']
if video_info['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')
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( player_json_data = self._download_json(
'https://shahid.mbc.net/arContent/getPlayerContent-param-.id-' + video_id + '.type-' + player_info['type'] + '.html', 'https://shahid.mbc.net/arContent/getPlayerContent-param-.id-' + video_id + '.type-' + player_info['type'] + '.html',
video_id video_id
@ -66,8 +54,22 @@ class ShahidIE(InfoExtractor):
else: else:
for error in player_json_data['error'].values(): for error in player_json_data['error'].values():
raise ExtractorError(error) raise ExtractorError(error)
return
formats = self._extract_m3u8_formats(m3u8_url, video_id) 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',
video_id
)['data']
if video_info.get('error'):
for error in video_info['error']:
raise ExtractorError(error)
video_info = video_info[player_type]
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'))
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': title,