From b905e5f583d06678ab0a54b53a227208de7c35ee Mon Sep 17 00:00:00 2001 From: Ricardo Garcia Date: Sun, 12 Dec 2010 19:21:09 +0100 Subject: [PATCH 1/3] Fix erroneous "content too short" error message --- youtube-dl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube-dl b/youtube-dl index 4cb84b22a..7d4344ae0 100755 --- a/youtube-dl +++ b/youtube-dl @@ -648,7 +648,7 @@ class FileDownloader(object): stream.close() self.report_finish() - if data_len is not None and str(byte_counter) != data_len: + if data_len is not None and byte_counter != data_len: raise ContentTooShortError(byte_counter, long(data_len)) self.try_rename(tmpfilename, filename) return True From 975a91d0ac950f8558067810ba64adb2fb4feada Mon Sep 17 00:00:00 2001 From: Ricardo Garcia Date: Wed, 15 Dec 2010 21:42:11 +0100 Subject: [PATCH 2/3] Take into account resume_len when calculating speed and ETA --- youtube-dl | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/youtube-dl b/youtube-dl index 7d4344ae0..cf0e9fcb8 100755 --- a/youtube-dl +++ b/youtube-dl @@ -617,10 +617,9 @@ class FileDownloader(object): before = time.time() data_block = data.read(block_size) after = time.time() - data_block_len = len(data_block) - if data_block_len == 0: + if len(data_block) == 0: break - byte_counter += data_block_len + byte_counter += len(data_block) # Open file just in time if stream is None: @@ -635,16 +634,16 @@ class FileDownloader(object): except (IOError, OSError), err: self.trouble(u'\nERROR: unable to write data: %s' % str(err)) return False - block_size = self.best_block_size(after - before, data_block_len) + block_size = self.best_block_size(after - before, len(data_block)) # Progress message percent_str = self.calc_percent(byte_counter, data_len) - eta_str = self.calc_eta(start, time.time(), data_len, byte_counter) - speed_str = self.calc_speed(start, time.time(), byte_counter) + eta_str = self.calc_eta(start, time.time(), data_len - resume_len, byte_counter - resume_len) + speed_str = self.calc_speed(start, time.time(), byte_counter - resume_len) self.report_progress(percent_str, data_len_str, speed_str, eta_str) # Apply rate limit - self.slow_down(start, byte_counter) + self.slow_down(start, byte_counter - resume_len) stream.close() self.report_finish() From a57ed21f6df916188229870fdfbcec5c58c89b0e Mon Sep 17 00:00:00 2001 From: Ricardo Garcia Date: Thu, 16 Dec 2010 07:09:58 +0100 Subject: [PATCH 3/3] Request page compression by default, like Firefox does --- youtube-dl | 1 + 1 file changed, 1 insertion(+) diff --git a/youtube-dl b/youtube-dl index cf0e9fcb8..a0b5577d5 100755 --- a/youtube-dl +++ b/youtube-dl @@ -33,6 +33,7 @@ std_headers = { 'User-Agent': 'Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.12) Gecko/20101028 Firefox/3.6.12', 'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7', 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', + 'Accept-Encoding': 'gzip, deflate', 'Accept-Language': 'en-us,en;q=0.5', }