projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Fix uploader id and uploader URL extraction
[youtube-dl]
/
youtube_dl
/
extractor
/
eagleplatform.py
diff --git
a/youtube_dl/extractor/eagleplatform.py
b/youtube_dl/extractor/eagleplatform.py
index 34891a3629f02a79d44cab15f0cce3dfb6c3af05..36fef07b72be4db2183f2ed5fdee63981781a688 100644
(file)
--- a/
youtube_dl/extractor/eagleplatform.py
+++ b/
youtube_dl/extractor/eagleplatform.py
@@
-4,14
+4,12
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from ..compat import (
- compat_HTTPError,
- compat_str,
-)
+from ..compat import compat_HTTPError
from ..utils import (
ExtractorError,
int_or_none,
unsmuggle_url,
from ..utils import (
ExtractorError,
int_or_none,
unsmuggle_url,
+ url_or_none,
)
)
@@
-53,7
+51,7
@@
class EaglePlatformIE(InfoExtractor):
'skip': 'Georestricted',
}, {
# referrer protected video (https://tvrain.ru/lite/teleshow/kak_vse_nachinalos/namin-418921/)
'skip': 'Georestricted',
}, {
# referrer protected video (https://tvrain.ru/lite/teleshow/kak_vse_nachinalos/namin-418921/)
- 'url': 'tvrainru.media.eagleplatform.com:582306',
+ 'url': '
eagleplatform:
tvrainru.media.eagleplatform.com:582306',
'only_matching': True,
}]
'only_matching': True,
}]
@@
-177,7
+175,7
@@
class EaglePlatformIE(InfoExtractor):
video_id, 'Downloading mp4 JSON', fatal=False)
if mp4_data:
for format_id, format_url in mp4_data.get('data', {}).items():
video_id, 'Downloading mp4 JSON', fatal=False)
if mp4_data:
for format_id, format_url in mp4_data.get('data', {}).items():
- if not
isinstance(format_url, compat_str
):
+ if not
url_or_none(format_url
):
continue
height = int_or_none(format_id)
if height is not None and m3u8_formats_dict.get(height):
continue
height = int_or_none(format_id)
if height is not None and m3u8_formats_dict.get(height):