RepoMirrors/syncplay
1
0
Fork 0
mirror of https://github.com/Syncplay/syncplay synced 2025-02-13 09:27:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always update VLC intf

Browse Source
This commit is contained in:
et0h 2020-09-19 15:46:40 +01:00
parent 8a1810fd2b
commit a02ddccf6b
1 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
syncplay/players/vlc.py
View File

@ -439,39 +439,19 @@ class VlcPlayer(BasePlayer):
else: else:
self.__playerController._client.ui.showDebugMessage("syncplay.lua intf directory not found, so creating directory '{}'".format(vlcSyncplayInterfaceDir)) self.__playerController._client.ui.showDebugMessage("syncplay.lua intf directory not found, so creating directory '{}'".format(vlcSyncplayInterfaceDir))
Path(vlcSyncplayInterfaceDir).mkdir(mode=0o755, parents=True, exist_ok=True) Path(vlcSyncplayInterfaceDir).mkdir(mode=0o755, parents=True, exist_ok=True)
def _intfNeedsUpdating(vlcSyncplayInterfacePath): try:
self.__playerController._client.ui.showDebugMessage("Checking if '{}' exists and if it is the expected version".format(vlcSyncplayInterfacePath)) _createIntfFolder(self.__playerController.vlcIntfUserPath)
if not os.path.isfile(vlcSyncplayInterfacePath): copyForm = utils.findResourcePath("syncplay.lua")
self.__playerController._client.ui.showDebugMessage("syncplay.lua not found, so file needs copying") copyTo = os.path.join(self.__playerController.vlcIntfUserPath, "syncplay.lua")
return True self.__playerController._client.ui.showDebugMessage("Copying VLC Lua Interface from '{}' to '{}'".format(copyForm, copyTo))
if os.path.isfile(vlcSyncplayInterfacePath): import shutil
with open(vlcSyncplayInterfacePath, 'rU') as interfacefile: if os.path.exists(copyTo):
for line in interfacefile:
if "local connectorversion" in line:
interface_version = line[26:31]
if interface_version == constants.VLC_INTERFACE_VERSION:
self.__playerController._client.ui.showDebugMessage("syncplay.lua exists and is expected version, so no file needs copying")
return False
else:
self.oldIntfVersion = line[26:31]
self.__playerController._client.ui.showDebugMessage("syncplay.lua is {} but expected version is {} so file needs to be copied".format(interface_version, constants.VLC_INTERFACE_VERSION))
return True
self.__playerController._client.ui.showDebugMessage("Up-to-dateness checks failed, so copy the file.")
return True
if _intfNeedsUpdating(os.path.join(self.__playerController.vlcIntfUserPath, "syncplay.lua")):
try:
_createIntfFolder(self.__playerController.vlcIntfUserPath)
copyForm = utils.findResourcePath("syncplay.lua")
copyTo = os.path.join(self.__playerController.vlcIntfUserPath, "syncplay.lua")
self.__playerController._client.ui.showDebugMessage("Copying VLC Lua Interface from '{}' to '{}'".format(copyForm, copyTo))
import shutil
if os.path.exists(copyTo):
os.chmod(copyTo, 0o755)
shutil.copyfile(copyForm, copyTo)
os.chmod(copyTo, 0o755) os.chmod(copyTo, 0o755)
except Exception as e: shutil.copyfile(copyForm, copyTo)
self.__playerController._client.ui.showErrorMessage(e) os.chmod(copyTo, 0o755)
return except Exception as e:
self.__playerController._client.ui.showErrorMessage(e)
return
if isLinux(): if isLinux():
self.__playerController.vlcDataPath = "/usr/lib/syncplay/resources" self.__playerController.vlcDataPath = "/usr/lib/syncplay/resources"
else: else: