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

Prevent escaping mpv via newlines

Browse Source
This commit is contained in:
Et0h 2016-05-08 14:17:42 +01:00
parent 1de40303bd
commit baceaad489
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
syncplay/players/mplayer.py
View File

@ -88,7 +88,7 @@ class MplayerPlayer(BasePlayer):
self._listener.sendLine("get_property {}".format(property_)) self._listener.sendLine("get_property {}".format(property_))
def displayMessage(self, message, duration=(constants.OSD_DURATION * 1000), secondaryOSD=False): def displayMessage(self, message, duration=(constants.OSD_DURATION * 1000), secondaryOSD=False):
self._listener.sendLine(u'{} "{!s}" {} {}'.format(self.OSD_QUERY, message, duration, constants.MPLAYER_OSD_LEVEL).encode('utf-8')) self._listener.sendLine(u'{} "{!s}" {} {}'.format(self.OSD_QUERY, self._stripNewlines(message), duration, constants.MPLAYER_OSD_LEVEL).encode('utf-8'))
def setSpeed(self, value): def setSpeed(self, value):
self._setProperty('speed', "{:.2f}".format(value)) self._setProperty('speed', "{:.2f}".format(value))
@ -129,10 +129,17 @@ class MplayerPlayer(BasePlayer):
def _getPosition(self): def _getPosition(self):
self._getProperty(self.POSITION_QUERY) self._getProperty(self.POSITION_QUERY)
def _stripNewlines(self, text):
text = text.replace("\r", "")
text = text.replace("\n", "")
return text
def _quoteArg(self, arg): def _quoteArg(self, arg):
arg = arg.replace('\\', '\\\\') arg = arg.replace('\\', '\\\\')
arg = arg.replace("'", "\\'") arg = arg.replace("'", "\\'")
arg = arg.replace('"', '\\"') arg = arg.replace('"', '\\"')
arg = arg.replace("\r", "")
arg = arg.replace("\n", "")
return u'"{}"'.format(arg) return u'"{}"'.format(arg)
def _fileIsLoaded(self): def _fileIsLoaded(self):