projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Capture and output login error message
[youtube-dl]
/
youtube_dl
/
extractor
/
laola1tv.py
diff --git
a/youtube_dl/extractor/laola1tv.py
b/youtube_dl/extractor/laola1tv.py
index 41d80bc12e69aa8ef4d54ff71ca667754d6b2409..2fab38079aac0c5f20a1772d52fa52642cb520bf 100644
(file)
--- a/
youtube_dl/extractor/laola1tv.py
+++ b/
youtube_dl/extractor/laola1tv.py
@@
-5,7
+5,7
@@
import re
from .common import InfoExtractor
from ..compat import (
from .common import InfoExtractor
from ..compat import (
- compat_urllib_parse,
+ compat_urllib_parse
_urlencode
,
compat_urlparse,
)
from ..utils import (
compat_urlparse,
)
from ..utils import (
@@
-63,6
+63,7
@@
class Laola1TvIE(InfoExtractor):
'params': {
'skip_download': True,
},
'params': {
'skip_download': True,
},
+ 'skip': 'This live stream has already finished.',
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-74,6
+75,9
@@
class Laola1TvIE(InfoExtractor):
webpage = self._download_webpage(url, display_id)
webpage = self._download_webpage(url, display_id)
+ if 'Dieser Livestream ist bereits beendet.' in webpage:
+ raise ExtractorError('This live stream has already finished.', expected=True)
+
iframe_url = self._search_regex(
r'<iframe[^>]*?id="videoplayer"[^>]*?src="([^"]+)"',
webpage, 'iframe url')
iframe_url = self._search_regex(
r'<iframe[^>]*?id="videoplayer"[^>]*?src="([^"]+)"',
webpage, 'iframe url')
@@
-90,7
+94,7
@@
class Laola1TvIE(InfoExtractor):
hd_doc = self._download_xml(
'http://www.laola1.tv/server/hd_video.php?%s'
hd_doc = self._download_xml(
'http://www.laola1.tv/server/hd_video.php?%s'
- % compat_urllib_parse
.
urlencode({
+ % compat_urllib_parse
_
urlencode({
'play': video_id,
'partner': partner_id,
'portal': portal,
'play': video_id,
'partner': partner_id,
'portal': portal,
@@
-108,7
+112,7
@@
class Laola1TvIE(InfoExtractor):
req = sanitized_Request(
'https://club.laola1.tv/sp/laola1/api/v3/user/session/premium/player/stream-access?%s' %
req = sanitized_Request(
'https://club.laola1.tv/sp/laola1/api/v3/user/session/premium/player/stream-access?%s' %
- compat_urllib_parse
.
urlencode({
+ compat_urllib_parse
_
urlencode({
'videoId': video_id,
'target': VS_TARGETS.get(kind, '2'),
'label': _v('label'),
'videoId': video_id,
'target': VS_TARGETS.get(kind, '2'),
'label': _v('label'),
@@
-130,6
+134,7
@@
class Laola1TvIE(InfoExtractor):
formats = self._extract_f4m_formats(
'%s?hdnea=%s&hdcore=3.2.0' % (token_attrib['url'], token_auth),
video_id, f4m_id='hds')
formats = self._extract_f4m_formats(
'%s?hdnea=%s&hdcore=3.2.0' % (token_attrib['url'], token_auth),
video_id, f4m_id='hds')
+ self._sort_formats(formats)
categories_str = _v('meta_sports')
categories = categories_str.split(',') if categories_str else []
categories_str = _v('meta_sports')
categories = categories_str.split(',') if categories_str else []