fenix
/
ytdl-nightly
mirror of https://github.com/ytdl-org/ytdl-nightly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[downloader/fragment] Do not report total bytes estimation and eta for live streams

This commit is contained in:
Sergey M․ 2016-01-30 19:20:52 +06:00
parent 53be8894e4
commit 5fa1702ca6
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
youtube_dl/downloader/fragment.py
View File

@ -26,7 +26,11 @@ class FragmentFD(FileDownloader):
self._start_frag_download(ctx) self._start_frag_download(ctx)
def _prepare_frag_download(self, ctx): def _prepare_frag_download(self, ctx):
self.to_screen('[%s] Total fragments: %d' % (self.FD_NAME, ctx['total_frags'])) if 'live' not in ctx:
ctx['live'] = False
self.to_screen(
'[%s] Total fragments: %s'
% (self.FD_NAME, ctx['total_frags'] if not ctx['live'] else 'unknown (live)'))
self.report_destination(ctx['filename']) self.report_destination(ctx['filename'])
dl = HttpQuietDownloader( dl = HttpQuietDownloader(
self.ydl, self.ydl,
@ -74,13 +78,15 @@ class FragmentFD(FileDownloader):
if s['status'] not in ('downloading', 'finished'): if s['status'] not in ('downloading', 'finished'):
return return
time_now = time.time()
frag_total_bytes = s.get('total_bytes') or 0 frag_total_bytes = s.get('total_bytes') or 0
estimated_size = ( if not ctx['live']:
(ctx['complete_frags_downloaded_bytes'] + frag_total_bytes) / estimated_size = (
(state['frag_index'] + 1) * total_frags) (ctx['complete_frags_downloaded_bytes'] + frag_total_bytes) /
time_now = time.time() (state['frag_index'] + 1) * total_frags)
state['total_bytes_estimate'] = estimated_size state['total_bytes_estimate'] = estimated_size
state['elapsed'] = time_now - start state['elapsed'] = time_now - start
if s['status'] == 'finished': if s['status'] == 'finished':
@ -91,9 +97,10 @@ class FragmentFD(FileDownloader):
else: else:
frag_downloaded_bytes = s['downloaded_bytes'] frag_downloaded_bytes = s['downloaded_bytes']
state['downloaded_bytes'] += frag_downloaded_bytes - ctx['prev_frag_downloaded_bytes'] state['downloaded_bytes'] += frag_downloaded_bytes - ctx['prev_frag_downloaded_bytes']
state['eta'] = self.calc_eta( if not ctx['live']:
start, time_now, estimated_size, state['eta'] = self.calc_eta(
state['downloaded_bytes']) start, time_now, estimated_size,
state['downloaded_bytes'])
state['speed'] = s.get('speed') state['speed'] = s.get('speed')
ctx['prev_frag_downloaded_bytes'] = frag_downloaded_bytes ctx['prev_frag_downloaded_bytes'] = frag_downloaded_bytes
self._hook_progress(state) self._hook_progress(state)