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

Relay error if file format is not recognized by mpv

Browse Source
This commit is contained in:
Et0h 2016-01-26 23:48:33 +00:00
parent 8334aa4682
commit 85ce40bdbd
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
syncplay/constants.py
View File

@ -111,6 +111,8 @@ MPV_ICONPATH = "mpv.png"
MPC_ICONPATH = "mpc-hc.png"
MPC64_ICONPATH = "mpc-hc64.png"
MPV_ERROR_MESSAGES_TO_REPEAT = ['[ytdl_hook] Your version of youtube-dl is too old', '[ytdl_hook] youtube-dl failed', 'Failed to recognize file format.']
#Changing these is usually not something you're looking for
PLAYER_ASK_DELAY = 0.1
PING_MOVING_AVERAGE_WEIGHT = 0.85

11
syncplay/players/mpv.py
View File

@ -83,7 +83,7 @@ class OldMpvPlayer(MpvPlayer):
self._paused = not self._paused
self._listener.sendLine('cycle pause')
def mpvVersionErrorCheck(self, line):
def mpvErrorCheck(self, line):
if "Error parsing option" in line or "Error parsing commandline option" in line:
self.quitReason = getMessage("mpv-version-error")
@ -91,14 +91,11 @@ class OldMpvPlayer(MpvPlayer):
self.reactor.callFromThread(self._client.ui.showErrorMessage, getMessage("mpv-version-error"), True)
self.drop()
elif "[ytdl_hook] Your version of youtube-dl is too old" in line:
self._client.ui.showErrorMessage(line)
elif "[ytdl_hook] youtube-dl failed" in line:
if any(errormsg in line for errormsg in constants.MPV_ERROR_MESSAGES_TO_REPEAT):
self._client.ui.showErrorMessage(line)
def _handleUnknownLine(self, line):
self.mpvVersionErrorCheck(line)
self.mpvErrorCheck(line)
if "Playing: " in line:
newpath = line[9:]
oldpath = self._filepath
@ -208,7 +205,7 @@ class NewMpvPlayer(OldMpvPlayer):
self._storePosition(0)
def _handleUnknownLine(self, line):
self.mpvVersionErrorCheck(line)
self.mpvErrorCheck(line)
if line == "<SyncplayUpdateFile>" or "Playing:" in line:
self._clearFileLoaded()