Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fixed defects found by Coverity

Browse Source
This commit is contained in:
alby128 2017-10-31 15:22:58 +01:00
parent b570624257
commit b3262a5a4f
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
syncplay/protocols.py
View File

@ -330,13 +330,19 @@ class SyncServerProtocol(JSONCommandProtocol):
def _extractHelloArguments(self, hello): def _extractHelloArguments(self, hello):
roomName = None roomName = None
username = hello["username"] if hello.has_key("username") else None if hello.has_key("username"):
username = username.strip() username = hello["username"]
username = username.strip()
else:
username = None
serverPassword = hello["password"] if hello.has_key("password") else None serverPassword = hello["password"] if hello.has_key("password") else None
room = hello["room"] if hello.has_key("room") else None room = hello["room"] if hello.has_key("room") else None
if room: if room:
roomName = room["name"] if room.has_key("name") else None if room.has_key("name"):
roomName = roomName.strip() roomName = room["name"]
roomName = roomName.strip()
else:
roomName = None
version = hello["version"] if hello.has_key("version") else None version = hello["version"] if hello.has_key("version") else None
version = hello["realversion"] if hello.has_key("realversion") else version version = hello["realversion"] if hello.has_key("realversion") else version
return username, serverPassword, roomName, version return username, serverPassword, roomName, version

2
syncplay/ui/gui.py
View File

@ -515,7 +515,7 @@ class MainWindow(QtGui.QMainWindow):
filenameitem.setForeground(QtGui.QBrush(QtGui.QColor(constants.STYLE_DIFFERENTITEM_COLOR))) filenameitem.setForeground(QtGui.QBrush(QtGui.QColor(constants.STYLE_DIFFERENTITEM_COLOR)))
filenameitem.setFont(underlinefont) filenameitem.setFont(underlinefont)
if not sameSize: if not sameSize:
if currentUser.file is not None and formatSize(user.file['size']) == formatSize(currentUser.file['size']): if formatSize(user.file['size']) == formatSize(currentUser.file['size']):
filesizeitem = QtGui.QStandardItem(formatSize(user.file['size'],precise=True)) filesizeitem = QtGui.QStandardItem(formatSize(user.file['size'],precise=True))
filesizeitem.setFont(underlinefont) filesizeitem.setFont(underlinefont)
filesizeitem.setForeground(QtGui.QBrush(QtGui.QColor(constants.STYLE_DIFFERENTITEM_COLOR))) filesizeitem.setForeground(QtGui.QBrush(QtGui.QColor(constants.STYLE_DIFFERENTITEM_COLOR)))

2
syncplay/utils.py
View File

@ -42,8 +42,8 @@ def retry(ExceptionToCheck, tries=4, delay=3, backoff=2, logger=None):
try_one_last_time = True try_one_last_time = True
while mtries > 1: while mtries > 1:
try: try:
#try_one_last_time = False
return f(*args, **kwargs) return f(*args, **kwargs)
try_one_last_time = False
break break
except ExceptionToCheck, e: except ExceptionToCheck, e:
if logger: if logger: