changeset 841c40a99615 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=841c40a99615
description: sends file request after hash mismatch
diffstat:
src/common/connection_handlers_events.py | 9 ++++---
src/common/jingle.py | 6 ++--
src/common/jingle_content.py | 40 ++++++++++++++++++++++++++++++++
src/common/jingle_ft.py | 28 +--------------------
src/common/jingle_session.py | 4 ++-
src/filetransfers_window.py | 11 +++++---
src/gui_interface.py | 2 +-
src/roster_window.py | 2 +-
8 files changed, 62 insertions(+), 40 deletions(-)
diffs (219 lines):
diff -r 4358cf55befc -r 841c40a99615 src/common/connection_handlers_events.py
--- a/src/common/connection_handlers_events.py Fri May 18 16:58:51 2012 +0200
+++ b/src/common/connection_handlers_events.py Sun May 27 21:05:43 2012 -0400
@@ -1973,12 +1973,13 @@
typ='stream')
raise xmpp.NodeProcessed
file_tag = si.getTag('file')
- for attribute in file_tag.getAttrs():
- if attribute in ('name', 'size', 'hash', 'date'):
- val = file_tag.getAttr(attribute)
+ for child in file_tag.getChildren():
+ name = child.getName()
+ if name in ('name', 'size', 'hash', 'date'):
+ val = child.getData()
if val is None:
continue
- self.file_props[attribute] = val
+ self.file_props[name] = val
file_desc_tag = file_tag.getTag('desc')
if file_desc_tag is not None:
self.file_props['desc'] = file_desc_tag.getData()
diff -r 4358cf55befc -r 841c40a99615 src/common/jingle.py
--- a/src/common/jingle.py Fri May 18 16:58:51 2012 +0200
+++ b/src/common/jingle.py Sun May 27 21:05:43 2012 -0400
@@ -101,7 +101,7 @@
# do we need to create a new jingle object
if sid not in self._sessions:
#TODO: tie-breaking and other things...
- newjingle = JingleSession(con=self, weinitiate=False, jid=jid,
+ newjingle = JingleSession(con=self, werequest=False,
weinitiate=False, jid=jid,
iq_id=id_, sid=sid)
self._sessions[sid] = newjingle
@@ -141,14 +141,14 @@
jingle.start_session()
return jingle.sid
- def start_file_transfer(self, jid, file_props):
+ def start_file_transfer(self, jid, file_props, request=False):
logger.info("start file transfer with file: %s" % file_props)
contact = gajim.contacts.get_contact_with_highest_priority(self.name,
gajim.get_jid_without_resource(jid))
if contact is None:
return
use_security = contact.supports(xmpp.NS_JINGLE_XTLS)
- jingle = JingleSession(self, weinitiate=True, jid=jid)
+ jingle = JingleSession(self, request, weinitiate=True, jid=jid)
# this is a file transfer
jingle.session_type_FT = True
self._sessions[jingle.sid] = jingle
diff -r 4358cf55befc -r 841c40a99615 src/common/jingle_content.py
--- a/src/common/jingle_content.py Fri May 18 16:58:51 2012 +0200
+++ b/src/common/jingle_content.py Sun May 27 21:05:43 2012 -0400
@@ -162,6 +162,46 @@
self.sent = True
content.addChild(node=self.transport.make_transport())
+ def _fill_content(self, content, action):
+ description_node = xmpp.simplexml.Node(
+ tag=xmpp.NS_JINGLE_FILE_TRANSFER + ' description')
+
+ if self.session.werequest:
+ simode = xmpp.simplexml.Node(tag='request')
+ else:
+ simode = xmpp.simplexml.Node(tag='offer')
+
+ file_tag = simode.setTag('file', namespace=xmpp.NS_FILE)
+ if 'name' in self.file_props:
+ node = xmpp.simplexml.Node(tag='name')
+ node.addData(self.file_props['name'])
+ file_tag.addChild(node=node)
+ if 'size' in self.file_props:
+ node = xmpp.simplexml.Node(tag='size')
+ node.addData(self.file_props['size'])
+ file_tag.addChild(node=node)
+ if 'hash' in self.file_props:
+ # TODO: use xep-300 for this bit
+ pass
+ desc = file_tag.setTag('desc')
+ if 'desc' in self.file_props:
+ desc.setData(self.file_props['desc'])
+
+ description_node.addChild(node=simode)
+
+ if self.use_security:
+ security = xmpp.simplexml.Node(
+ tag=xmpp.NS_JINGLE_XTLS + ' security')
+ # TODO: add fingerprint element
+ for m in ('x509', ): # supported authentication methods
+ method = xmpp.simplexml.Node(tag='method')
+ method.setAttr('name', m)
+ security.addChild(node=method)
+ content.addChild(node=security)
+
+ content.addChild(node=description_node)
+
+
def destroy(self):
self.callbacks = None
del self.session.contents[(self.creator, self.name)]
diff -r 4358cf55befc -r 841c40a99615 src/common/jingle_ft.py
--- a/src/common/jingle_ft.py Fri May 18 16:58:51 2012 +0200
+++ b/src/common/jingle_ft.py Sun May 27 21:05:43 2012 -0400
@@ -132,6 +132,8 @@
return
h = xmpp.Hashes()
hash_ = h.calculateHash(self.session.hash_algo, file_)
+ # DEBUG
+ #hash_ = '1294809248109223'
if not hash_:
# Hash alogrithm not supported
return
@@ -294,32 +296,6 @@
else:
self.__state_changed(STATE_CAND_SENT, args)
- def _fill_content(self, content):
- description_node = xmpp.simplexml.Node(
- tag=xmpp.NS_JINGLE_FILE_TRANSFER + ' description')
-
- sioffer = xmpp.simplexml.Node(tag='offer')
- file_tag = sioffer.setTag('file', namespace=xmpp.NS_FILE)
- file_tag.setAttr('name', self.file_props['name'])
- file_tag.setAttr('size', self.file_props['size'])
- desc = file_tag.setTag('desc')
- if 'desc' in self.file_props:
- desc.setData(self.file_props['desc'])
-
- description_node.addChild(node=sioffer)
-
- if self.use_security:
- security = xmpp.simplexml.Node(
- tag=xmpp.NS_JINGLE_XTLS + ' security')
- # TODO: add fingerprint element
- for m in ('x509', ): # supported authentication methods
- method = xmpp.simplexml.Node(tag='method')
- method.setAttr('name', m)
- security.addChild(node=method)
- content.addChild(node=security)
-
- content.addChild(node=description_node)
-
def _store_socks5_sid(self, sid, hash_id):
# callback from socsk5queue.start_listener
self.file_props['hash'] = hash_id
diff -r 4358cf55befc -r 841c40a99615 src/common/jingle_session.py
--- a/src/common/jingle_session.py Fri May 18 16:58:51 2012 +0200
+++ b/src/common/jingle_session.py Sun May 27 21:05:43 2012 -0400
@@ -63,7 +63,7 @@
negotiated between an initiator and a responder.
"""
- def __init__(self, con, weinitiate, jid, iq_id=None, sid=None):
+ def __init__(self, con, werequest, weinitiate, jid, iq_id=None, sid=None):
"""
con -- connection object,
weinitiate -- boolean, are we the initiator?
@@ -83,6 +83,8 @@
self.responder = weinitiate and self.peerjid or self.ourjid
# are we an initiator?
self.weinitiate = weinitiate
+ # Are we requesting or offering a file?
+ self.werequest = werequest
# what state is session in? (one from JingleStates)
self.state = JingleStates.ended
if not sid:
diff -r 4358cf55befc -r 841c40a99615 src/filetransfers_window.py
--- a/src/filetransfers_window.py Fri May 18 16:58:51 2012 +0200
+++ b/src/filetransfers_window.py Sun May 27 21:05:43 2012 -0400
@@ -37,7 +37,6 @@
is_transfer_stopped)
from common.xmpp.protocol import NS_JINGLE_FILE_TRANSFER
import logging
-
log = logging.getLogger('gajim.filetransfer_window')
C_IMAGE = 0
@@ -249,10 +248,14 @@
dialogs.ErrorDialog(_('File transfer stopped'), sectext)
self.tree.get_selection().unselect_all()
- def show_hash_error(self, jid, file_props):
+ def show_hash_error(self, jid, file_props, account):
def on_yes(dummy):
- # TODO: Request the file to the sender
- pass
+ # Request the file to the sender
+ sid = gajim.connections[account].start_file_transfer(jid,
+ file_props,
+ True)
+ file_props['sid'] = sid
+
if file_props['type'] == 'r':
file_name = os.path.basename(file_props['file-name'])
diff -r 4358cf55befc -r 841c40a99615 src/gui_interface.py
--- a/src/gui_interface.py Fri May 18 16:58:51 2012 +0200
+++ b/src/gui_interface.py Sun May 27 21:05:43 2012 -0400
@@ -989,7 +989,7 @@
ft.show_stopped(jid, file_props,
error_msg=_('Error opening file'))
elif file_props['error'] == -10:
- ft.show_hash_error(jid, file_props)
+ ft.show_hash_error(jid, file_props, account)
return
msg_type = ''
diff -r 4358cf55befc -r 841c40a99615 src/roster_window.py
--- a/src/roster_window.py Fri May 18 16:58:51 2012 +0200
+++ b/src/roster_window.py Sun May 27 21:05:43 2012 -0400
@@ -1978,7 +1978,7 @@
gajim.events.remove_events(account, jid, event)
return True
elif event.type_ == 'file-hash-error':
- ft.show_hash_error(jid, data)
+ ft.show_hash_error(jid, data, account)
gajim.events.remove_events(account, jid, event)
elif event.type_ == 'file-completed':
ft.show_completed(jid, data)
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
