mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-06 10:59:36 +02:00
[shahid] generic errors handling and check with flake8
This commit is contained in:
parent
dfaba1ab95
commit
3be3c622dc
@ -1,3 +1,6 @@
|
||||
# coding: utf-8
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from .common import InfoExtractor
|
||||
from ..utils import (
|
||||
js_to_json,
|
||||
@ -5,6 +8,7 @@
|
||||
int_or_none
|
||||
)
|
||||
|
||||
|
||||
class ShahidIE(InfoExtractor):
|
||||
_VALID_URL = r'https?://shahid\.mbc\.net/ar/episode/(?P<id>\d+)/?'
|
||||
_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',
|
||||
'only_matching': True
|
||||
}
|
||||
@ -32,31 +36,15 @@ class ShahidIE(InfoExtractor):
|
||||
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():
|
||||
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']
|
||||
|
||||
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(
|
||||
'https://shahid.mbc.net/arContent/getPlayerContent-param-.id-' + video_id + '.type-' + player_info['type'] + '.html',
|
||||
video_id
|
||||
@ -66,8 +54,22 @@ def _real_extract(self, url):
|
||||
else:
|
||||
for error in player_json_data['error'].values():
|
||||
raise ExtractorError(error)
|
||||
return
|
||||
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 {
|
||||
'id': video_id,
|
||||
'title': title,
|
||||
|
Loading…
Reference in New Issue
Block a user