From 658b4b718a74c3858da37c56f98f14f24dee4f96 Mon Sep 17 00:00:00 2001 From: ingvar1995 Date: Thu, 28 Apr 2016 20:39:40 +0300 Subject: [PATCH] incoming avatars improvements --- src/file_transfers.py | 5 ++++- src/tox.py | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/file_transfers.py b/src/file_transfers.py index 24f04af..da6c73f 100644 --- a/src/file_transfers.py +++ b/src/file_transfers.py @@ -150,7 +150,8 @@ class ReceiveTransfer(FileTransfer): def __init__(self, path, tox, friend_number, size, file_number): super(ReceiveTransfer, self).__init__(path, tox, friend_number, size, file_number) self._file = open(self._path, 'wb') - self._file.truncate(0) + if type(self) is not ReceiveAvatar: + self._file.truncate(0) self._file_size = 0 def cancel(self): @@ -236,6 +237,8 @@ class ReceiveAvatar(ReceiveTransfer): self.send_control(TOX_FILE_CONTROL['CANCEL']) self.state = TOX_FILE_TRANSFER_STATE['CANCELED'] else: + self._file.truncate(0) self.send_control(TOX_FILE_CONTROL['RESUME']) else: + self._file.truncate(0) self.send_control(TOX_FILE_CONTROL['RESUME']) diff --git a/src/tox.py b/src/tox.py index da18b7e..fef6bfc 100644 --- a/src/tox.py +++ b/src/tox.py @@ -1133,8 +1133,8 @@ class Tox(object): if file_id is None: file_id = create_string_buffer(TOX_FILE_ID_LENGTH) tox_err_file_get = c_int() - Tox.libtoxcore.tox_file_control(self._tox_pointer, c_uint32(friend_number), c_uint32(file_number), file_id, - addressof(tox_err_file_get)) + Tox.libtoxcore.tox_file_get_file_id(self._tox_pointer, c_uint32(friend_number), c_uint32(file_number), file_id, + addressof(tox_err_file_get)) tox_err_file_get = tox_err_file_get.value if tox_err_file_get == TOX_ERR_FILE_GET['OK']: return bin_to_string(file_id, TOX_FILE_ID_LENGTH)