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

Add support for mpv installed from microsoft store

Browse Source
This commit is contained in:
soredake 2024-01-05 19:43:55 +02:00
parent b8de12f40e
commit 9b0b502490
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
syncplay/constants.py
View File

@ -178,6 +178,7 @@ MPVNET_PATHS = [r"c:\program files\mpv.net\mpvnet.exe", r"c:\program Files (x86)
try: try:
import os import os
MPVNET_PATHS.append(os.path.expandvars(r'%LOCALAPPDATA%\Microsoft\WindowsApps\mpvnet.exe')) MPVNET_PATHS.append(os.path.expandvars(r'%LOCALAPPDATA%\Microsoft\WindowsApps\mpvnet.exe'))
MPV_PATHS.append(os.path.expandvars(r'%LOCALAPPDATA%\Microsoft\WindowsApps\mpv.exe'))
except: except:
pass pass
VLC_PATHS = [ VLC_PATHS = [

7
syncplay/players/mpv.py
View File

@ -12,6 +12,7 @@ from syncplay.messages import getMessage
from syncplay.players.basePlayer import BasePlayer from syncplay.players.basePlayer import BasePlayer
from syncplay.utils import isURL, findResourcePath from syncplay.utils import isURL, findResourcePath
from syncplay.utils import isMacOS, isWindows, isASCII from syncplay.utils import isMacOS, isWindows, isASCII
from syncplay.utils import playerPathExists
from syncplay.vendor.python_mpv_jsonipc.python_mpv_jsonipc import MPV from syncplay.vendor.python_mpv_jsonipc.python_mpv_jsonipc import MPV
class MpvPlayer(BasePlayer): class MpvPlayer(BasePlayer):
@ -90,11 +91,11 @@ class MpvPlayer(BasePlayer):
@staticmethod @staticmethod
def getExpandedPath(playerPath): def getExpandedPath(playerPath):
if not os.path.isfile(playerPath): if not playerPathExists(playerPath):
if os.path.isfile(playerPath + "mpv.exe"): if playerPathExists(playerPath + "mpv.exe"):
playerPath += "mpv.exe" playerPath += "mpv.exe"
return playerPath return playerPath
elif os.path.isfile(playerPath + "\\mpv.exe"): elif playerPathExists(playerPath + "\\mpv.exe"):
playerPath += "\\mpv.exe" playerPath += "\\mpv.exe"
return playerPath return playerPath
if os.access(playerPath, os.X_OK): if os.access(playerPath, os.X_OK):