emdee/toxygen
1
0
Fork 0
Code Issues 1 Pull Requests Actions Wiki Activity

incoming avatars improvements

Browse Source
This commit is contained in:
ingvar1995 2016-04-28 20:39:40 +03:00
parent c30abec24d
commit 658b4b718a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/file_transfers.py
View File

@ -150,7 +150,8 @@ class ReceiveTransfer(FileTransfer):
def __init__(self, path, tox, friend_number, size, file_number): def __init__(self, path, tox, friend_number, size, file_number):
super(ReceiveTransfer, self).__init__(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 = open(self._path, 'wb')
self._file.truncate(0) if type(self) is not ReceiveAvatar:
self._file.truncate(0)
self._file_size = 0 self._file_size = 0
def cancel(self): def cancel(self):
@ -236,6 +237,8 @@ class ReceiveAvatar(ReceiveTransfer):
self.send_control(TOX_FILE_CONTROL['CANCEL']) self.send_control(TOX_FILE_CONTROL['CANCEL'])
self.state = TOX_FILE_TRANSFER_STATE['CANCELED'] self.state = TOX_FILE_TRANSFER_STATE['CANCELED']
else: else:
self._file.truncate(0)
self.send_control(TOX_FILE_CONTROL['RESUME']) self.send_control(TOX_FILE_CONTROL['RESUME'])
else: else:
self._file.truncate(0)
self.send_control(TOX_FILE_CONTROL['RESUME']) self.send_control(TOX_FILE_CONTROL['RESUME'])

4
src/tox.py
View File

@ -1133,8 +1133,8 @@ class Tox(object):
if file_id is None: if file_id is None:
file_id = create_string_buffer(TOX_FILE_ID_LENGTH) file_id = create_string_buffer(TOX_FILE_ID_LENGTH)
tox_err_file_get = c_int() tox_err_file_get = c_int()
Tox.libtoxcore.tox_file_control(self._tox_pointer, c_uint32(friend_number), c_uint32(file_number), file_id, 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)) addressof(tox_err_file_get))
tox_err_file_get = tox_err_file_get.value tox_err_file_get = tox_err_file_get.value
if tox_err_file_get == TOX_ERR_FILE_GET['OK']: if tox_err_file_get == TOX_ERR_FILE_GET['OK']:
return bin_to_string(file_id, TOX_FILE_ID_LENGTH) return bin_to_string(file_id, TOX_FILE_ID_LENGTH)