Compare commits

..

No commits in common. "87d98d495e467089f56935dabc00d7faf2b852be" and "fa9b849f7ffd553b47b6c89bbe4eea9c623ccab2" have entirely different histories.

View File

@ -11,6 +11,7 @@ from ..utils import (
float_or_none, float_or_none,
get_element_by_class, get_element_by_class,
get_element_by_id, get_element_by_id,
int_or_none,
parse_duration, parse_duration,
qualities, qualities,
str_to_int, str_to_int,
@ -247,25 +248,18 @@ class TwitCastingLiveIE(InfoExtractor):
'Downloading live video of user {0}. ' 'Downloading live video of user {0}. '
'Pass "https://twitcasting.tv/{0}/show" to download the history'.format(uploader_id)) 'Pass "https://twitcasting.tv/{0}/show" to download the history'.format(uploader_id))
is_live = traverse_obj(self._download_json( webpage = self._download_webpage(f'https://twitcasting.tv/{uploader_id}/show/', uploader_id)
f'https://frontendapi.twitcasting.tv/watch/user/{uploader_id}', current_live = None
uploader_id, 'Checking live status', data=b'', fatal=False), ('is_live', {bool})) is_live = self._search_regex(
if is_live is False: # only raise here if API response was as expected
raise UserNotLive(video_id=uploader_id)
# Use /show/ page so that password-protected and members-only livestreams can be found
webpage = self._download_webpage(
f'https://twitcasting.tv/{uploader_id}/show/', uploader_id, 'Downloading live history')
is_live = is_live or self._search_regex(
r'(?s)(<span\s*class="tw-movie-thumbnail2-badge"\s*data-status="live">\s*LIVE)', r'(?s)(<span\s*class="tw-movie-thumbnail2-badge"\s*data-status="live">\s*LIVE)',
webpage, 'is live?', default=False) webpage, 'is live?', default=None)
# Current live is always the first match if is_live:
current_live = self._search_regex( # get the first live; running live is always at the first
r'(?s)<a\s+class="tw-movie-thumbnail2"\s+href="/[^/"]+/movie/(?P<video_id>\d+)"', current_live = int_or_none(self._search_regex(
webpage, 'current live ID', default=None, group='video_id') r'(?s)<a\s+class="tw-movie-thumbnail2"\s*href="/[^/]+/movie/(?P<video_id>\d+)"\s*>.+?</a>',
webpage, 'current live ID', default=None, group='video_id'))
if not is_live or not current_live: if not is_live or not current_live:
raise UserNotLive(video_id=uploader_id) raise UserNotLive(video_id=uploader_id)
return self.url_result(f'https://twitcasting.tv/{uploader_id}/movie/{current_live}', TwitCastingIE) return self.url_result(f'https://twitcasting.tv/{uploader_id}/movie/{current_live}', TwitCastingIE)