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

Fixed problems with encodings in gui

Browse Source
This commit is contained in:
Uriziel 2013-06-08 14:30:50 +02:00
parent d3db5831ec
commit 23d3e964e5
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
syncplay/client.py
View File

@ -543,7 +543,7 @@ class SyncplayUserlist(object):
def __addUserWithFileToList(self, rooms, user): def __addUserWithFileToList(self, rooms, user):
currentPosition = utils.formatTime(user.lastPosition) currentPosition = utils.formatTime(user.lastPosition)
file_key = '\'{}\' ({}/{})'.format(user.file['name'], currentPosition, utils.formatTime(user.file['duration'])) file_key = u'\'{}\' ({}/{})'.format(user.file['name'], currentPosition, utils.formatTime(user.file['duration']))
if (not rooms[user.room].has_key(file_key)): if (not rooms[user.room].has_key(file_key)):
rooms[user.room][file_key] = {} rooms[user.room][file_key] = {}
rooms[user.room][file_key][user.username] = user rooms[user.room][file_key][user.username] = user

4
syncplay/messages.py
View File

@ -176,8 +176,8 @@ messages = {
def getMessage(locale, type_): def getMessage(locale, type_):
if(messages.has_key(locale)): if(messages.has_key(locale)):
if(messages[locale].has_key(type_)): if(messages[locale].has_key(type_)):
return messages[locale][type_] return unicode(messages[locale][type_])
if(messages["en"].has_key(type_)): if(messages["en"].has_key(type_)):
return messages["en"][type_] return unicode(messages["en"][type_])
else: else:
raise KeyError() raise KeyError()

1
syncplay/players/mpc.py
View File

@ -79,7 +79,6 @@ class MpcHcApi:
self.__listener.SendCommand(self.CMD_SETSPEED, unicode(rate)) self.__listener.SendCommand(self.CMD_SETSPEED, unicode(rate))
def sendOsd(self, message, MsgPos=constants.MPC_OSD_POSITION, DurationMs=(constants.OSD_DURATION*1000)): def sendOsd(self, message, MsgPos=constants.MPC_OSD_POSITION, DurationMs=(constants.OSD_DURATION*1000)):
message = message.decode()
class __OSDDATASTRUCT(ctypes.Structure): class __OSDDATASTRUCT(ctypes.Structure):
_fields_ = [ _fields_ = [
('nMsgPos', ctypes.c_int32), ('nMsgPos', ctypes.c_int32),

4
syncplay/ui/ConfigurationGetter.py
View File

@ -178,7 +178,7 @@ class ConfigurationGetter(object):
def __wasOptionChanged(self, parser, section, option): def __wasOptionChanged(self, parser, section, option):
if (parser.has_option(section, option)): if (parser.has_option(section, option)):
if (parser.get(section, option) != str(self._config[option])): if (parser.get(section, option) != unicode(self._config[option])):
return True return True
else: else:
return True return True
@ -196,7 +196,7 @@ class ConfigurationGetter(object):
for option in options: for option in options:
if(self.__wasOptionChanged(parser, section, option)): if(self.__wasOptionChanged(parser, section, option)):
changed = True changed = True
parser.set(section, option, str(self._config[option])) parser.set(section, option, unicode(self._config[option]))
if(changed): if(changed):
parser.write(codecs.open(iniPath, "wb", "utf_8_sig")) parser.write(codecs.open(iniPath, "wb", "utf_8_sig"))

4
syncplay/ui/gui.py
View File

@ -14,7 +14,7 @@ class MainDialog(QtGui.QDialog):
return None return None
def showMessage(self, message, noTimestamp=False): def showMessage(self, message, noTimestamp=False):
message = message.encode(sys.stdout.encoding, 'replace') message = unicode(message)
message = message.replace("&", "&amp;").replace('"', "&quot;").replace("<", "&lt;").replace(">", "&gt;") message = message.replace("&", "&amp;").replace('"', "&quot;").replace("<", "&lt;").replace(">", "&gt;")
message = message.replace("\n", "<br />") message = message.replace("\n", "<br />")
if(noTimestamp): if(noTimestamp):
@ -23,7 +23,7 @@ class MainDialog(QtGui.QDialog):
self.newMessage(time.strftime(constants.UI_TIME_FORMAT, time.localtime()) + message + "<br />") self.newMessage(time.strftime(constants.UI_TIME_FORMAT, time.localtime()) + message + "<br />")
def showListMessage(self, message): def showListMessage(self, message):
message = message.encode(sys.stdout.encoding, 'replace') message = unicode(message)
message = message.replace("&", "&amp;").replace('"', "&quot;").replace("<", "&lt;").replace(">", "&gt;") message = message.replace("&", "&amp;").replace('"', "&quot;").replace("<", "&lt;").replace(">", "&gt;")
message = message.replace("\t", "&nbsp;"*4) message = message.replace("\t", "&nbsp;"*4)
self._listBuffer += message + "<br />" self._listBuffer += message + "<br />"