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

coding standards

Browse source
This commit is contained in:
Jefry Lagrange 2012-09-22 22:16:03 -04:00
parent f94a8cec1b
commit a8922c32a8
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/connection_handlers_events.py
View file

@ -2003,9 +2003,9 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
h = file_tag.getTag('hash') h = file_tag.getTag('hash')
n = file_tag.getTag('name') n = file_tag.getTag('name')
if h: if h:
file_info = self.conn.get_files_info(hash_=h) file_info = self.conn.get_file_info(hash_=h)
elif n: elif n:
file_info = self.conn.get_files_info(name=n) file_info = self.conn.get_file_info(name=n)
self.file_props.file_name = file_info['file-name'] self.file_props.file_name = file_info['file-name']
self.file_props.sender = self.conn._ft_get_our_jid() self.file_props.sender = self.conn._ft_get_our_jid()
self.file_props.receiver = self.fjid self.file_props.receiver = self.fjid

6
src/common/jingle.py
View file

@ -189,12 +189,12 @@ class ConnectionJingle(object):
else: else:
return sessions return sessions
def set_files_info(self, file_): def set_file_info(self, file_):
# Saves information about the files we have transfered in case they need # Saves information about the files we have transfered in case they need
# to be requested again. # to be requested again.
self.files.append(file_) self.files.append(file_)
def get_files_info(self, hash_=None, name=None): def get_file_info(self, hash_=None, name=None):
if hash_: if hash_:
for f in self.files: # DEBUG for f in self.files: # DEBUG
#if f['hash'] == '1294809248109223': #if f['hash'] == '1294809248109223':
@ -217,5 +217,5 @@ class ConnectionJingle(object):
for session in self._sessions.values(): for session in self._sessions.values():
if session.peerjid == jid and session.get_content(media): if session.peerjid == jid and session.get_content(media):
return session return session
return None return None

2
src/common/jingle_content.py
View file

@ -203,7 +203,7 @@ class JingleContent(object):
'date' : self.file_props.date, 'date' : self.file_props.date,
'peerjid' : pjid 'peerjid' : pjid
} }
self.session.connection.set_files_info(file_info) self.session.connection.set_file_info(file_info)
desc = file_tag.setTag('desc') desc = file_tag.setTag('desc')
if self.file_props.desc: if self.file_props.desc:
desc.setData(self.file_props.desc) desc.setData(self.file_props.desc)

2
src/common/jingle_ft.py
View file

@ -142,7 +142,7 @@ class JingleFileTransfer(JingleContent):
'date' : self.file_props.date, 'date' : self.file_props.date,
'peerjid' : pjid 'peerjid' : pjid
} }
self.session.connection.set_files_info(file_info) self.session.connection.set_file_info(file_info)
def _calcHash(self): def _calcHash(self):
# Caculates the hash and returns a xep-300 hash stanza # Caculates the hash and returns a xep-300 hash stanza

4
src/common/jingle_session.py
View file

@ -522,9 +522,9 @@ class JingleSession(object):
h = request.getTag('file').getTag('hash') h = request.getTag('file').getTag('hash')
n = request.getTag('file').getTag('name') n = request.getTag('file').getTag('name')
if h: if h:
file_info = self.connection.get_files_info(hash_=h) file_info = self.connection.get_file_info(hash_=h)
elif n: elif n:
file_info = self.connection.get_files_info(name=n) file_info = self.connection.get_file_info(name=n)
pjid = gajim.get_jid_without_resource(self.peerjid) pjid = gajim.get_jid_without_resource(self.peerjid)
if not file_info or file_info['peerjid'] != pjid: if not file_info or file_info['peerjid'] != pjid:
log.warning('The peer ' + pjid + \ log.warning('The peer ' + pjid + \