emdee/toxygen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

file control callback added, screenshots added

Browse source
This commit is contained in:
ingvar1995 2016-03-23 17:27:05 +03:00
parent 779e81acb9
commit 2e333085f0
4 changed files with 51 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/profile.py
View file

@ -736,15 +736,19 @@ class Profile(Contact, Singleton):
friend = self.get_friend_by_number(friend_number)
if settings['allow_auto_accept'] and friend.tox_id in settings['auto_accept_from_friends']:
path = settings['auto_accept_path'] or curr_directory()
# TODO: check if file exists
item = self.create_file_transfer_item(file_name.decode('utf-8'), size, friend_number, file_number, False)
self.accept_transfer(item, path + '/' + file_name.decode('utf-8'), friend_number, file_number)
else:
self.create_file_transfer_item(file_name.decode('utf-8'), size, friend_number, file_number, True)
def cancel_transfer(self, friend_number, file_number):
def cancel_transfer(self, friend_number, file_number, already_cancelled=False):
if (friend_number, file_number) in self._file_transfers:
tr = self._file_transfers[(friend_number, file_number)]
tr.cancel()
if not already_cancelled:
tr.cancel()
else:
tr.cancelled()
del self._file_transfers[(friend_number, file_number)]
def accept_transfer(self, item, path, friend_number, file_number, size):
@ -783,6 +787,13 @@ class Profile(Contact, Singleton):
sa = SendAvatar(avatar_path, self._tox, friend_number)
self._file_transfers[(friend_number, sa.get_file_number())] = sa
def send_screenshot(self, data):
friend_number = self.get_active_number()
st = SendFromBuffer(self._tox, friend_number, data, 'toxygen_inline.png')
self._file_transfers[(friend_number, st.get_file_number())] = st
item = self.create_file_transfer_item('toxygen_inline.png', len(data), friend_number, st.get_file_number(), False)
st.set_state_changed_handler(item.update)
def send_file(self, path):
friend_number = self.get_active_number()
st = SendTransfer(path, self._tox, friend_number)