diff options
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/downloader/f4m.py | 3 | ||||
| -rw-r--r-- | youtube_dl/downloader/http.py | 5 | ||||
| -rw-r--r-- | youtube_dl/downloader/rtmp.py | 1 |
3 files changed, 1 insertions, 8 deletions
diff --git a/youtube_dl/downloader/f4m.py b/youtube_dl/downloader/f4m.py index 5a1f8e680..b40ebfa50 100644 --- a/youtube_dl/downloader/f4m.py +++ b/youtube_dl/downloader/f4m.py @@ -15,7 +15,6 @@ from ..compat import ( from ..utils import ( struct_pack, struct_unpack, - format_bytes, encodeFilename, sanitize_open, xpath_text, @@ -334,10 +333,8 @@ class F4mFD(FileDownloader): if s['status'] == 'finished': progress = self.calc_percent(state['frag_index'], total_frags) - byte_counter = state['downloaded_bytes'] else: frag_downloaded_bytes = s['downloaded_bytes'] - byte_counter = state['downloaded_bytes'] + frag_downloaded_bytes frag_progress = self.calc_percent(frag_downloaded_bytes, frag_total_bytes) progress = self.calc_percent(state['frag_index'], total_frags) diff --git a/youtube_dl/downloader/http.py b/youtube_dl/downloader/http.py index d37522aea..6dec528f2 100644 --- a/youtube_dl/downloader/http.py +++ b/youtube_dl/downloader/http.py @@ -15,7 +15,6 @@ from ..utils import ( ContentTooShortError, encodeFilename, sanitize_open, - format_bytes, ) @@ -137,7 +136,6 @@ class HttpFD(FileDownloader): self.to_screen('\r[download] File is larger than max-filesize (%s bytes > %s bytes). Aborting.' % (data_len, max_data_len)) return False - data_len_str = format_bytes(data_len) byte_counter = 0 + resume_len block_size = self.params.get('buffersize', 1024) start = time.time() @@ -196,9 +194,8 @@ class HttpFD(FileDownloader): # Progress message speed = self.calc_speed(start, now, byte_counter - resume_len) if data_len is None: - eta = percent = None + eta = None else: - percent = self.calc_percent(byte_counter, data_len) eta = self.calc_eta(start, time.time(), data_len - resume_len, byte_counter - resume_len) self._hook_progress({ diff --git a/youtube_dl/downloader/rtmp.py b/youtube_dl/downloader/rtmp.py index 79836fe99..0a52c34c7 100644 --- a/youtube_dl/downloader/rtmp.py +++ b/youtube_dl/downloader/rtmp.py @@ -11,7 +11,6 @@ from ..compat import compat_str from ..utils import ( check_executable, encodeFilename, - format_bytes, get_exe_version, ) |