copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ability to send several files at the same time. We need to accept them all before transfer starts for the moment.

This commit is contained in:
Yann Leboulanger 2010-08-26 11:56:12 +02:00
parent f951df7ead
commit 99981e57b8
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/jingle_ft.py
View File

@ -188,7 +188,8 @@ class JingleFileTransfer(JingleContent):
gajim.socks5queue.add_receiver(self.session.connection.name, gajim.socks5queue.add_receiver(self.session.connection.name,
receiver) receiver)
streamhost_used['idx'] = receiver.queue_idx streamhost_used['idx'] = receiver.queue_idx
gajim.socks5queue.on_success = self.transport._on_proxy_auth_ok gajim.socks5queue.on_success[self.file_props['sid']] = \
self.transport._on_proxy_auth_ok
else: else:
jid = gajim.get_jid_without_resource(self.session.ourjid) jid = gajim.get_jid_without_resource(self.session.ourjid)
gajim.socks5queue.send_file(self.file_props, gajim.socks5queue.send_file(self.file_props,

14
src/common/socks5.py
View File

@ -81,8 +81,8 @@ class SocksQueue:
self.complete_transfer_cb = complete_transfer_cb self.complete_transfer_cb = complete_transfer_cb
self.progress_transfer_cb = progress_transfer_cb self.progress_transfer_cb = progress_transfer_cb
self.error_cb = error_cb self.error_cb = error_cb
self.on_success = None self.on_success = {} # {id: cb}
self.on_failure = None self.on_failure = {} # {id: cb}
def start_listener(self, port, sha_str, sha_handler, sid, fingerprint=None): def start_listener(self, port, sha_str, sha_handler, sid, fingerprint=None):
""" """
@ -110,7 +110,7 @@ class SocksQueue:
if 'proxyhosts' in file_props: if 'proxyhosts' in file_props:
for proxy in file_props['proxyhosts']: for proxy in file_props['proxyhosts']:
if proxy == streamhost: if proxy == streamhost:
self.on_success(streamhost) self.on_success[file_props['sid']](streamhost)
return 2 return 2
return 0 return 0
if 'streamhosts' in file_props: if 'streamhosts' in file_props:
@ -118,14 +118,14 @@ class SocksQueue:
if streamhost['state'] == 1: if streamhost['state'] == 1:
return 0 return 0
streamhost['state'] = 1 streamhost['state'] = 1
self.on_success(streamhost) self.on_success[file_props['sid']](streamhost)
return 1 return 1
return 0 return 0
def connect_to_hosts(self, account, sid, on_success=None, on_failure=None, def connect_to_hosts(self, account, sid, on_success=None, on_failure=None,
fingerprint=None): fingerprint=None):
self.on_success = on_success self.on_success[sid] = on_success
self.on_failure = on_failure self.on_failure[sid] = on_failure
file_props = self.files_props[account][sid] file_props = self.files_props[account][sid]
file_props['failure_cb'] = on_failure file_props['failure_cb'] = on_failure
@ -304,6 +304,8 @@ class SocksQueue:
if account in self.files_props: if account in self.files_props:
fl_props = self.files_props[account] fl_props = self.files_props[account]
if sid in fl_props: if sid in fl_props:
del self.on_success[sid]
del self.on_failure[sid]
del(fl_props[sid]) del(fl_props[sid])
if len(self.files_props) == 0: if len(self.files_props) == 0: