tretrauit
/
worthless-launcher
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Wait for patch process to exit 

Bump to 1.2.9-2
This commit is contained in:
tretrauit 2022-02-27 13:36:57 +07:00
parent f7e5362e86
commit 8f541ff0c4
Signed by: tretrauit
GPG Key ID: 862760FF1903319E
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -9,7 +9,7 @@ README = (HERE / "README.md").read_text()
setup(
name='worthless',
version='1.2.9-1',
version='1.2.9-2',
packages=['worthless', 'worthless.classes', 'worthless.classes.launcher', 'worthless.classes.installer'],
url='https://git.froggi.es/tretrauit/worthless-launcher',
license='MIT License',

1
worthless/linux.py
View File

@ -12,6 +12,7 @@ class LinuxUtils:
"""Execute a command using pkexec (friendly gui)
"""
rsp = await asyncio.create_subprocess_exec(*args)
await rsp.wait()
match rsp.returncode:
case 127:
raise OSError("Authentication failed.")

23
worthless/patcher.py
View File

@ -147,9 +147,12 @@ class Patcher:
gamever = "".join(self._installer.get_game_version().split("."))
unity_path = self._gamedir.joinpath("UnityPlayer.dll")
unity_path.rename(self._gamedir.joinpath("UnityPlayer.dll.bak"))
await asyncio.create_subprocess_exec("xdelta3", "-d", "-s", str(self._gamedir.joinpath("UnityPlayer.dll.bak")),
str(self._patch_path.joinpath("{}/patch_files/{}".format(gamever, patch))),
str(self._gamedir.joinpath("UnityPlayer.dll")), cwd=self._gamedir)
proc = await asyncio.create_subprocess_exec("xdelta3", "-d", "-s",
str(self._gamedir.joinpath("UnityPlayer.dll.bak")),
str(self._patch_path.joinpath(
"{}/patch_files/{}".format(gamever, patch))),
str(self._gamedir.joinpath("UnityPlayer.dll")), cwd=self._gamedir)
await proc.wait()
async def _patch_xlua_fallback(self):
# xdelta3-python doesn't work becuase it's outdated.
@ -161,11 +164,15 @@ class Patcher:
data_name = self._installer.get_game_data_name()
xlua_path = self._gamedir.joinpath("{}/Plugins/xlua.dll".format(data_name))
xlua_path.rename(self._gamedir.joinpath("{}/Plugins/xlua.dll.bak".format(data_name)))
await asyncio.create_subprocess_exec("xdelta3", "-d", "-s",
str(self._gamedir.joinpath("{}/Plugins/xlua.dll.bak".format(data_name))),
str(self._patch_path.joinpath("{}/patch_files/{}".format(gamever, patch))),
str(self._gamedir.joinpath("{}/Plugins/xlua.dll".format(data_name))),
cwd=self._gamedir)
proc = await asyncio.create_subprocess_exec("xdelta3", "-d", "-s",
str(self._gamedir.joinpath(
"{}/Plugins/xlua.dll.bak".format(data_name))),
str(self._patch_path.joinpath(
"{}/patch_files/{}".format(gamever, patch))),
str(self._gamedir.joinpath(
"{}/Plugins/xlua.dll".format(data_name))),
cwd=self._gamedir)
await proc.wait()
def _patch_unityplayer(self):
if self._overseas: