revil-O/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

Wait for the media file to be ready before failing

Browse source
This commit is contained in:
Fabio Manganiello 2019-02-05 00:52:14 +01:00
parent 52d0ba442b
commit 3798414f22
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
platypush/plugins/media/webtorrent.py
View file

@ -127,6 +127,7 @@ class MediaWebtorrentPlugin(MediaPlugin):
state = TorrentState.IDLE state = TorrentState.IDLE
bus = get_bus() bus = get_bus()
webtorrent_url = None webtorrent_url = None
output_dir = None
media_file = None media_file = None
poll = select.poll() poll = select.poll()
@ -156,14 +157,6 @@ class MediaWebtorrentPlugin(MediaPlugin):
'downloading: (.+?)$', line, flags=re.IGNORECASE 'downloading: (.+?)$', line, flags=re.IGNORECASE
).group(1)) ).group(1))
media_files = sorted(find_files_by_ext(
output_dir, *self._media_plugin.video_extensions))
if not media_files:
raise RuntimeError('No video files found in {}'.
format(output_dir))
media_file = os.path.join(output_dir, media_files[0])
elif 'server running at: ' in line.lower() \ elif 'server running at: ' in line.lower() \
and webtorrent_url is None: and webtorrent_url is None:
# Streaming started # Streaming started
@ -172,6 +165,16 @@ class MediaWebtorrentPlugin(MediaPlugin):
self.logger.info('Torrent stream started on {}'.format( self.logger.info('Torrent stream started on {}'.format(
webtorrent_url)) webtorrent_url))
if output_dir and not media_file:
media_files = sorted(find_files_by_ext(
output_dir, *self._media_plugin.video_extensions))
if media_files:
# TODO support for queueing multiple media
media_file = os.path.join(output_dir, media_files[0])
else:
time.sleep(1) # Wait before the media file is created
if state.value <= TorrentState.DOWNLOADING_METADATA.value \ if state.value <= TorrentState.DOWNLOADING_METADATA.value \
and media_file and webtorrent_url: and media_file and webtorrent_url:
# DOWNLOADING_METADATA -> DOWNLOADING # DOWNLOADING_METADATA -> DOWNLOADING
@ -182,9 +185,19 @@ class MediaWebtorrentPlugin(MediaPlugin):
break break
if not output_dir:
raise RuntimeError('Could not download torrent')
if not media_file or not webtorrent_url: if not media_file or not webtorrent_url:
raise RuntimeError('The webtorrent process did not ' + if not media_file:
'provide the required data') self.logger.warning(
'The torrent does not contain any video files')
else:
self.logger.warning('WebTorrent could not start streaming')
# Keep downloading but don't start the player
try: self._webtorrent_process.wait()
except: pass
return
# Then wait until we have enough chunks to start the player # Then wait until we have enough chunks to start the player
while True: while True: