]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[downloader/fragment] Remove unused code and fix zero division error
authorSergey M․ <dstftw@gmail.com>
Tue, 12 Jan 2016 16:09:38 +0000 (22:09 +0600)
committerSergey M․ <dstftw@gmail.com>
Tue, 12 Jan 2016 16:09:38 +0000 (22:09 +0600)
youtube_dl/downloader/fragment.py

index 3da554622e77c072427cac997f9acf7f785671dc..d236ac7375ef7522172be7d67092409727b7f4bd 100644 (file)
@@ -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)