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

refactoring

This commit is contained in:
Jefry Lagrange 2012-08-30 23:09:23 -04:00
parent 036a309093
commit c64bac1535
2 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/common/connection_handlers_events.py
View File

@ -1986,23 +1986,11 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
self.file_props.transport_sid = self.FT_content.transport.sid self.file_props.transport_sid = self.FT_content.transport.sid
self.FT_content.file_props = self.file_props self.FT_content.file_props = self.file_props
self.FT_content.transport.set_file_props(self.file_props) self.FT_content.transport.set_file_props(self.file_props)
if self.file_props.streamhosts:
self.file_props.streamhosts.extend( self.file_props.streamhosts.extend(
self.FT_content.transport.remote_candidates) self.FT_content.transport.remote_candidates)
else:
self.file_props.streamhosts = \
self.FT_content.transport.remote_candidates
for host in self.file_props.streamhosts: for host in self.file_props.streamhosts:
host['initiator'] = self.FT_content.session.initiator host['initiator'] = self.FT_content.session.initiator
host['target'] = self.FT_content.session.responder host['target'] = self.FT_content.session.responder
else:
si = self.stanza.getTag('si')
self.file_props = FilesProp.getNewFileProp(self.conn.name,
unicode(si.getAttr('id'))
)
self.file_props.sender = self.fjid
self.file_props.request_id = self.id_
if self.jingle_content:
self.file_props.session_type = 'jingle' self.file_props.session_type = 'jingle'
self.file_props.stream_methods = xmpp.NS_BYTESTREAM self.file_props.stream_methods = xmpp.NS_BYTESTREAM
desc = self.jingle_content.getTag('description') desc = self.jingle_content.getTag('description')
@ -2024,8 +2012,11 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
self.file_props.hash_ = val self.file_props.hash_ = val
if name == 'date': if name == 'date':
self.file_props.date = val self.file_props.date = val
else: else:
si = self.stanza.getTag('si')
self.file_props = FilesProp.getNewFileProp(self.conn.name,
unicode(si.getAttr('id'))
)
profile = si.getAttr('profile') profile = si.getAttr('profile')
if profile != xmpp.NS_FILE: if profile != xmpp.NS_FILE:
self.conn.send_file_rejection(self.file_props, code='400', self.conn.send_file_rejection(self.file_props, code='400',
@ -2056,18 +2047,16 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
self.file_props.name = val self.file_props.name = val
if name == 'size': if name == 'size':
self.file_props.size = val self.file_props.size = val
file_desc_tag = file_tag.getTag('desc')
if file_desc_tag is not None:
self.file_props.desc = file_desc_tag.getData()
if not self.jingle_content:
mime_type = si.getAttr('mime-type') mime_type = si.getAttr('mime-type')
if mime_type is not None: if mime_type is not None:
self.file_props.mime_type = mime_type self.file_props.mime_type = mime_type
self.file_props.sender = self.fjid
self.file_props.request_id = self.id_
file_desc_tag = file_tag.getTag('desc')
if file_desc_tag is not None:
self.file_props.desc = file_desc_tag.getData()
self.file_props.receiver = self.conn._ft_get_our_jid() self.file_props.receiver = self.conn._ft_get_our_jid()
self.file_props.transfered_size = [] self.file_props.transfered_size = []
return True return True
class FileRequestErrorEvent(nec.NetworkIncomingEvent): class FileRequestErrorEvent(nec.NetworkIncomingEvent):

5
src/common/jingle_session.py
View File

@ -335,8 +335,8 @@ class JingleSession(object):
action = 'iq-result' action = 'iq-result'
callables = self.callbacks[action] callables = self.callbacks[action]
try: try:
for callable in callables: for call in callables:
callable(stanza=stanza, jingle=jingle, error=error, action=action) call(stanza=stanza, jingle=jingle, error=error, action=action)
except xmpp.NodeProcessed: except xmpp.NodeProcessed:
pass pass
except TieBreak: except TieBreak:
@ -528,6 +528,7 @@ class JingleSession(object):
' is requesting a ' + \ ' is requesting a ' + \
'file that we dont have') 'file that we dont have')
self.decline_session() self.decline_session()
raise xmpp.NodeProcessed
# If there's no content we understand... # If there's no content we understand...
if not contents: if not contents:
# TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate # TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate