projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[vk] Detect geo restriction
[youtube-dl]
/
youtube_dl
/
extractor
/
animeondemand.py
diff --git
a/youtube_dl/extractor/animeondemand.py
b/youtube_dl/extractor/animeondemand.py
index be032d5b42a22d18c2e0fa2d2c43c258f4e18fd6..00ce684d1c9811ef3ba885194c23fd012d935b6b 100644
(file)
--- a/
youtube_dl/extractor/animeondemand.py
+++ b/
youtube_dl/extractor/animeondemand.py
@@
-8,6
+8,7
@@
from ..utils import (
determine_ext,
extract_attributes,
ExtractorError,
determine_ext,
extract_attributes,
ExtractorError,
+ url_or_none,
urlencode_postdata,
urljoin,
)
urlencode_postdata,
urljoin,
)
@@
-52,7
+53,7
@@
class AnimeOnDemandIE(InfoExtractor):
}]
def _login(self):
}]
def _login(self):
-
(username, password)
= self._get_login_info()
+
username, password
= self._get_login_info()
if username is None:
return
if username is None:
return
@@
-85,7
+86,7
@@
class AnimeOnDemandIE(InfoExtractor):
if all(p not in response for p in ('>Logout<', 'href="/users/sign_out"')):
error = self._search_regex(
if all(p not in response for p in ('>Logout<', 'href="/users/sign_out"')):
error = self._search_regex(
- r'<p[^>]+\bclass=(["\'])(?:(?!\1).)*\balert\
s
(?:(?!\1).)*\1[^>]*>(?P<error>.+?)</p>',
+ r'<p[^>]+\bclass=(["\'])(?:(?!\1).)*\balert\
b
(?:(?!\1).)*\1[^>]*>(?P<error>.+?)</p>',
response, 'error', default=None, group='error')
if error:
raise ExtractorError('Unable to login: %s' % error, expected=True)
response, 'error', default=None, group='error')
if error:
raise ExtractorError('Unable to login: %s' % error, expected=True)
@@
-165,7
+166,7
@@
class AnimeOnDemandIE(InfoExtractor):
}, fatal=False)
if not playlist:
continue
}, fatal=False)
if not playlist:
continue
- stream_url =
playlist.get('streamurl'
)
+ stream_url =
url_or_none(playlist.get('streamurl')
)
if stream_url:
rtmp = re.search(
r'^(?P<url>rtmpe?://(?P<host>[^/]+)/(?P<app>.+/))(?P<playpath>mp[34]:.+)',
if stream_url:
rtmp = re.search(
r'^(?P<url>rtmpe?://(?P<host>[^/]+)/(?P<app>.+/))(?P<playpath>mp[34]:.+)',