projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[mailru] Fix extraction (closes #24530) (#25239)
[youtube-dl]
/
youtube_dl
/
extractor
/
hidive.py
diff --git
a/youtube_dl/extractor/hidive.py
b/youtube_dl/extractor/hidive.py
index d8f2e682fbb50adf60763443adff8961ff53de9e..f26f80265678576217994746d9286482c5184a3d 100644
(file)
--- a/
youtube_dl/extractor/hidive.py
+++ b/
youtube_dl/extractor/hidive.py
@@
-8,6
+8,7
@@
from ..compat import compat_str
from ..utils import (
ExtractorError,
int_or_none,
from ..utils import (
ExtractorError,
int_or_none,
+ url_or_none,
urlencode_postdata,
)
urlencode_postdata,
)
@@
-18,7
+19,6
@@
class HiDiveIE(InfoExtractor):
# so disabling geo bypass completely
_GEO_BYPASS = False
_NETRC_MACHINE = 'hidive'
# so disabling geo bypass completely
_GEO_BYPASS = False
_NETRC_MACHINE = 'hidive'
- _LOGGED_IN = False
_LOGIN_URL = 'https://www.hidive.com/account/login'
_TESTS = [{
_LOGIN_URL = 'https://www.hidive.com/account/login'
_TESTS = [{
@@
-38,10
+38,7
@@
class HiDiveIE(InfoExtractor):
}]
def _real_initialize(self):
}]
def _real_initialize(self):
- if self._LOGGED_IN:
- return
-
- (email, password) = self._get_login_info()
+ email, password = self._get_login_info()
if email is None:
return
if email is None:
return
@@
-56,7
+53,6
@@
class HiDiveIE(InfoExtractor):
})
self._download_webpage(
self._LOGIN_URL, None, 'Logging in', data=urlencode_postdata(data))
})
self._download_webpage(
self._LOGIN_URL, None, 'Logging in', data=urlencode_postdata(data))
- self._LOGGED_IN = True
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
@@
-85,8
+81,8
@@
class HiDiveIE(InfoExtractor):
bitrates = rendition.get('bitrates')
if not isinstance(bitrates, dict):
continue
bitrates = rendition.get('bitrates')
if not isinstance(bitrates, dict):
continue
- m3u8_url =
bitrates.get('hls'
)
- if not
isinstance(m3u8_url, compat_str)
:
+ m3u8_url =
url_or_none(bitrates.get('hls')
)
+ if not
m3u8_url
:
continue
formats.extend(self._extract_m3u8_formats(
m3u8_url, video_id, 'mp4', entry_protocol='m3u8_native',
continue
formats.extend(self._extract_m3u8_formats(
m3u8_url, video_id, 'mp4', entry_protocol='m3u8_native',
@@
-98,9
+94,8
@@
class HiDiveIE(InfoExtractor):
if not isinstance(cc_file, list) or len(cc_file) < 3:
continue
cc_lang = cc_file[0]
if not isinstance(cc_file, list) or len(cc_file) < 3:
continue
cc_lang = cc_file[0]
- cc_url = cc_file[2]
- if not isinstance(cc_lang, compat_str) or not isinstance(
- cc_url, compat_str):
+ cc_url = url_or_none(cc_file[2])
+ if not isinstance(cc_lang, compat_str) or not cc_url:
continue
subtitles.setdefault(cc_lang, []).append({
'url': cc_url,
continue
subtitles.setdefault(cc_lang, []).append({
'url': cc_url,