9de3b4d86f
* Ädd support for IINA * cleanup * Add start background image * Restore comment * Support custom player path * Update messages * Separate IINA changes from python_mpv_jsonipc * Do not show file info for our placeholder image in the UI * Fix mpv socket * Fix running IINA from frozen app Apparently, `iina-cli` gets confused when launched from a frozen app and automatically adds `--stdin` to its passed launch arguments. But then, it waits for a file to be piped and, because there is none, the player crashes almost immediately. Sending `--no-stdin` to the process resolves the ambiguity and does not cause any harm if Syncplay is started from sources. * Pass again environment to the subprocess.Popen call that opens mpv Related to: c07206c18992c1dca401b30a01b9f0fe54a71df5
89 lines
2.8 KiB
Python
89 lines
2.8 KiB
Python
import os
|
|
from syncplay import constants
|
|
from syncplay.utils import findResourcePath
|
|
from syncplay.players.mpv import MpvPlayer
|
|
from syncplay.players.ipc_iina import IINA
|
|
|
|
class IinaPlayer(MpvPlayer):
|
|
|
|
@staticmethod
|
|
def run(client, playerPath, filePath, args):
|
|
constants.MPV_NEW_VERSION = True
|
|
constants.MPV_OSC_VISIBILITY_CHANGE_VERSION = True
|
|
return IinaPlayer(client, IinaPlayer.getExpandedPath(playerPath), filePath, args)
|
|
|
|
@staticmethod
|
|
def getStartupArgs(userArgs):
|
|
args = {}
|
|
if userArgs:
|
|
for argToAdd in userArgs:
|
|
if argToAdd.startswith('--'):
|
|
argToAdd = argToAdd[2:]
|
|
elif argToAdd.startswith('-'):
|
|
argToAdd = argToAdd[1:]
|
|
if argToAdd.strip() == "":
|
|
continue
|
|
if "=" in argToAdd:
|
|
(argName, argValue) = argToAdd.split("=", 1)
|
|
else:
|
|
argName = argToAdd
|
|
argValue = "yes"
|
|
args[argName] = argValue
|
|
return args
|
|
|
|
@staticmethod
|
|
def getDefaultPlayerPathsList():
|
|
l = []
|
|
for path in constants.IINA_PATHS:
|
|
p = IinaPlayer.getExpandedPath(path)
|
|
if p:
|
|
l.append(p)
|
|
return l
|
|
|
|
@staticmethod
|
|
def isValidPlayerPath(path):
|
|
if "iina-cli" in path or "iina-cli" in IinaPlayer.getExpandedPath(path):
|
|
return True
|
|
return False
|
|
|
|
@staticmethod
|
|
def getExpandedPath(playerPath):
|
|
if "iina-cli" in playerPath:
|
|
pass
|
|
elif "IINA.app/Contents/MacOS/IINA" in playerPath:
|
|
playerPath = os.path.join(os.path.dirname(playerPath), "iina-cli")
|
|
|
|
if os.access(playerPath, os.X_OK):
|
|
return playerPath
|
|
for path in os.environ['PATH'].split(':'):
|
|
path = os.path.join(os.path.realpath(path), playerPath)
|
|
if os.access(path, os.X_OK):
|
|
return path
|
|
return playerPath
|
|
|
|
@staticmethod
|
|
def getIconPath(path):
|
|
return constants.IINA_ICONPATH
|
|
|
|
def __init__(self, client, playerPath, filePath, args):
|
|
from twisted.internet import reactor
|
|
self.reactor = reactor
|
|
self._client = client
|
|
self._set_defaults()
|
|
|
|
self._playerIPCHandler = IINA
|
|
self._create_listener(playerPath, filePath, args)
|
|
|
|
def _preparePlayer(self):
|
|
for key, value in constants.IINA_PROPERTIES.items():
|
|
self._setProperty(key, value)
|
|
self._listener.sendLine(["load-script", findResourcePath("syncplayintf.lua")])
|
|
super()._preparePlayer()
|
|
|
|
def _onFileUpdate(self):
|
|
# do not show file info for our placeholder image in Syncplay UI
|
|
if self._filename == "iina-bkg.png":
|
|
return
|
|
else:
|
|
super()._onFileUpdate()
|