about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-01-12 22:09:38 +0600
committerSergey M․ <dstftw@gmail.com>2016-01-12 22:09:38 +0600
commit9cb1a06b6c8fbeb6cfdbf0533ea60a6624fa1246 (patch)
treed22e1bbb59cd00551f4fdaf34bf28c96a2ac7f36
parentbe27283ef68e96d2461875a2bfb8c9ce962cfe61 (diff)
downloadyoutube-dl-9cb1a06b6c8fbeb6cfdbf0533ea60a6624fa1246.tar.gz
youtube-dl-9cb1a06b6c8fbeb6cfdbf0533ea60a6624fa1246.tar.xz
youtube-dl-9cb1a06b6c8fbeb6cfdbf0533ea60a6624fa1246.zip
[downloader/fragment] Remove unused code and fix zero division error
-rw-r--r--youtube_dl/downloader/fragment.py13
1 files changed, 3 insertions, 10 deletions
diff --git a/youtube_dl/downloader/fragment.py b/youtube_dl/downloader/fragment.py
index 3da554622..d236ac737 100644
--- a/youtube_dl/downloader/fragment.py
+++ b/youtube_dl/downloader/fragment.py
@@ -78,17 +78,10 @@ class FragmentFD(FileDownloader):
             state['total_bytes_estimate'] = estimated_size
             state['elapsed'] = time_now - start
 
-            if s['status'] == 'finished':
-                progress = self.calc_percent(state['frag_index'], total_frags)
-            else:
-                frag_downloaded_bytes = s['downloaded_bytes']
-                frag_progress = self.calc_percent(frag_downloaded_bytes,
-                                                  frag_total_bytes)
-                progress = self.calc_percent(state['frag_index'], total_frags)
-                progress += frag_progress / float(total_frags)
-
+            if s['status'] != 'finished':
                 state['eta'] = self.calc_eta(
-                    start, time_now, estimated_size, state['downloaded_bytes'] + frag_downloaded_bytes)
+                    start, time_now, estimated_size,
+                    state['downloaded_bytes'] + s['downloaded_bytes'])
                 state['speed'] = s.get('speed')
             self._hook_progress(state)