projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
53be889
)
[downloader/fragment] Do not report total bytes estimation and eta for live streams
author
Sergey M․
<dstftw@gmail.com>
Sat, 30 Jan 2016 13:20:52 +0000
(19:20 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 30 Jan 2016 13:20:52 +0000
(19:20 +0600)
youtube_dl/downloader/fragment.py
patch
|
blob
|
history
diff --git
a/youtube_dl/downloader/fragment.py
b/youtube_dl/downloader/fragment.py
index 0c9113d0fa7cad4e5b77d572dcf97246be71dc8b..e2f34eec69092e96fa799e9ed78482c50779fc57 100644
(file)
--- a/
youtube_dl/downloader/fragment.py
+++ b/
youtube_dl/downloader/fragment.py
@@
-26,7
+26,11
@@
class FragmentFD(FileDownloader):
self._start_frag_download(ctx)
def _prepare_frag_download(self, ctx):
self._start_frag_download(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'])
dl = HttpQuietDownloader(
self.ydl,
self.report_destination(ctx['filename'])
dl = HttpQuietDownloader(
self.ydl,
@@
-74,13
+78,15
@@
class FragmentFD(FileDownloader):
if s['status'] not in ('downloading', 'finished'):
return
if s['status'] not in ('downloading', 'finished'):
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 = (
- (ctx['complete_frags_downloaded_bytes'] + frag_total_bytes) /
- (state['frag_index'] + 1) * total_frags)
-
time_now = time.time(
)
- state['total_bytes_estimate'] = estimated_size
+ if not ctx['live']:
+ estimated_size = (
+ (ctx['complete_frags_downloaded_bytes'] + frag_total_bytes) /
+
(state['frag_index'] + 1) * total_frags
)
+
state['total_bytes_estimate'] = estimated_size
state['elapsed'] = time_now - start
if s['status'] == 'finished':
state['elapsed'] = time_now - start
if s['status'] == 'finished':
@@
-91,9
+97,10
@@
class FragmentFD(FileDownloader):
else:
frag_downloaded_bytes = s['downloaded_bytes']
state['downloaded_bytes'] += frag_downloaded_bytes - ctx['prev_frag_downloaded_bytes']
else:
frag_downloaded_bytes = s['downloaded_bytes']
state['downloaded_bytes'] += frag_downloaded_bytes - ctx['prev_frag_downloaded_bytes']
- state['eta'] = self.calc_eta(
- start, time_now, estimated_size,
- state['downloaded_bytes'])
+ if not ctx['live']:
+ state['eta'] = self.calc_eta(
+ start, time_now, estimated_size,
+ state['downloaded_bytes'])
state['speed'] = s.get('speed')
ctx['prev_frag_downloaded_bytes'] = frag_downloaded_bytes
self._hook_progress(state)
state['speed'] = s.get('speed')
ctx['prev_frag_downloaded_bytes'] = frag_downloaded_bytes
self._hook_progress(state)