projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #7436 from davidbz/add_proxy_to_update_procedure
[youtube-dl]
/
youtube_dl
/
extractor
/
viewster.py
diff --git
a/youtube_dl/extractor/viewster.py
b/youtube_dl/extractor/viewster.py
index 487f2d7442e40263decac29b0f40bf3ed825650d..7cf930d699fd75ad564ead644a4371d401df137a 100644
(file)
--- a/
youtube_dl/extractor/viewster.py
+++ b/
youtube_dl/extractor/viewster.py
@@
-95,7
+95,7
@@
class ViewsterIE(InfoExtractor):
entry_id = info.get('Id') or info['id']
# unfinished serie has no Type
entry_id = info.get('Id') or info['id']
# unfinished serie has no Type
- if info.get('Type') in
['Serie', None]
:
+ if info.get('Type') in
('Serie', None)
:
try:
episodes = self._download_json(
'https://public-api.viewster.com/series/%s/episodes' % entry_id,
try:
episodes = self._download_json(
'https://public-api.viewster.com/series/%s/episodes' % entry_id,
@@
-131,10
+131,11
@@
class ViewsterIE(InfoExtractor):
formats.extend(self._extract_f4m_formats(
video_url, video_id, f4m_id='hds'))
elif ext == 'm3u8':
formats.extend(self._extract_f4m_formats(
video_url, video_id, f4m_id='hds'))
elif ext == 'm3u8':
-
formats.extend(
self._extract_m3u8_formats(
+
m3u8_formats =
self._extract_m3u8_formats(
video_url, video_id, 'mp4', m3u8_id='hls',
video_url, video_id, 'mp4', m3u8_id='hls',
- fatal=False # m3u8 sometimes fail
- ))
+ fatal=False) # m3u8 sometimes fail
+ if m3u8_formats:
+ formats.extend(m3u8_formats)
else:
format_id = media.get('Bitrate')
f = {
else:
format_id = media.get('Bitrate')
f = {