changeset b61843db50c4 in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b61843db50c4 description: correctly compute FT speed and ETA. Fixes #8216

diffstat:

src/common/socks5.py | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-)

diffs (83 lines):

diff -r 8a1a607ca026 -r b61843db50c4 src/common/socks5.py --- a/src/common/socks5.py Sat Apr 02 15:29:26 2016 +0100 +++ b/src/common/socks5.py Mon Apr 04 21:10:57 2016 +0200 @@ -26,6 +26,7 @@ import struct import hashlib import os +import time from errno import EWOULDBLOCK from errno import ENOBUFS from errno import EINTR @@ -292,7 +293,7 @@ sender.file_props.paused = False sender.file_props.stalled = False sender.file_props.elapsed_time = 0 - sender.file_props.last_time = self.idlequeue.current_time() + sender.file_props.last_time = time.time() sender.file_props.received_len = 0 sender.pauses = 0 # start sending file to proxy @@ -606,7 +607,7 @@ fd = open(self.file_props.file_name, opt) self.file_props.fd = fd self.file_props.elapsed_time = 0 - self.file_props.last_time = self.idlequeue.current_time() + self.file_props.last_time = time.time() self.file_props.received_len = offset return fd

@@ -679,7 +680,7 @@ self.file_props.error = -1 return -1 self.size += lenn - current_time = self.idlequeue.current_time() + current_time = time.time() self.file_props.elapsed_time += current_time - \ self.file_props.last_time self.file_props.last_time = current_time @@ -720,7 +721,7 @@ return 0 fd.write(self.remaining_buff) lenn = len(self.remaining_buff) - current_time = self.idlequeue.current_time() + current_time = time.time() self.file_props.elapsed_time += current_time - \ self.file_props.last_time self.file_props.last_time = current_time @@ -747,7 +748,7 @@ raise e except Exception: buff = b'' - current_time = self.idlequeue.current_time() + current_time = time.time() self.file_props.elapsed_time += current_time - \ self.file_props.last_time self.file_props.last_time = current_time @@ -952,7 +953,7 @@ self.file_props.stalled = False self.file_props.connected = True self.file_props.elapsed_time = 0 - self.file_props.last_time = self.idlequeue.current_time() + self.file_props.last_time = time.time() self.file_props.received_len = 0

def start_transfer(self): @@ -1039,7 +1040,7 @@ self.file_props.stalled = False self.file_props.connected = True self.file_props.elapsed_time = 0 - self.file_props.last_time = self.idlequeue.current_time() + self.file_props.last_time = time.time() self.file_props.received_len = 0 self.pauses = 0 self.state = 7 @@ -1240,7 +1241,7 @@ self.file_props.paused = False self.file_props.stalled = False self.file_props.elapsed_time = 0 - self.file_props.last_time = self.idlequeue.current_time() + self.file_props.last_time = time.time() self.file_props.received_len = 0 self.pauses = 0 # start sending file contents to socket