R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[puhutv] improvement

Browse Source
This commit is contained in:
Enes 2018-05-09 17:27:14 +03:00
parent e257b8dc2d
commit 70a61e595f
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
youtube_dl/extractor/puhutv.py
View File

@ -106,7 +106,8 @@ class PuhuTVIE(InfoExtractor):
tags = [] tags = []
for tag in tags_list: for tag in tags_list:
tags.append(tag.get('name')) if tag.get('name'):
tags.append(tag.get('name'))
thumbnails = [] thumbnails = []
for id, url in thumbnails_list.items(): for id, url in thumbnails_list.items():
@ -119,21 +120,27 @@ class PuhuTVIE(InfoExtractor):
for subtitle in subtitles_list: for subtitle in subtitles_list:
lang = subtitle.get('language') lang = subtitle.get('language')
sub_url = subtitle.get('url') sub_url = subtitle.get('url')
# If the keys were changed by api, continue
if not lang or not sub_url:
continue
subtitles[self._SUBTITLE_LANGS.get(lang, lang)] = [{ subtitles[self._SUBTITLE_LANGS.get(lang, lang)] = [{
'url': sub_url, 'url': sub_url,
'ext': determine_ext(sub_url) 'ext': determine_ext(sub_url)
}] }]
format_dict = self._download_json( # Some of videos are geo restricted upon request copyright owner and returns 403
req_formats = self._download_json(
'https://puhutv.com/api/assets/%s/videos' % display_id, 'https://puhutv.com/api/assets/%s/videos' % display_id,
video_id, 'Downloading video JSON').get('data').get('videos') video_id, 'Downloading video JSON')
if not format_dict: if not req_formats:
self.raise_geo_restricted() self.raise_geo_restricted()
else:
format_dict = req_formats.get('data').get('videos')
formats = [] formats = []
for format in format_dict: for format in format_dict:
media_url = format.get('url') media_url = format.get('url')
ext = format.get('video_format') ext = format.get('video_format') or determine_ext(media_url)
quality = format.get('quality') quality = format.get('quality')
if ext == 'mp4' and format.get('is_playlist') is False: if ext == 'mp4' and format.get('is_playlist') is False:
formats.append({ formats.append({
@ -211,7 +218,7 @@ class PuhuTVSerieIE(InfoExtractor):
'https://puhutv.com/%s-izle' % video_id, 'https://puhutv.com/%s-izle' % video_id,
PuhuTVIE.ie_key(), video_id) PuhuTVIE.ie_key(), video_id)
pagenum = pagenum + 1 pagenum = pagenum + 1
has_more = season_info.get('hasMore') has_more = season_info.get('hasMore', False)
def _real_extract(self, url): def _real_extract(self, url):
playlist_id = self._match_id(url) playlist_id = self._match_id(url)