clockworkpi/launcher
1
0
Fork 0
mirror of https://github.com/clockworkpi/launcher.git synced 2025-12-13 18:28:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #154 from cuu/master

Browse Source 
bug fix
This commit is contained in:
GNU 2019-01-18 00:20:18 +08:00 committed by GitHub
commit d13e410aa7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys.py/UI/CommercialSoftwarePackage/__init__.py
View File

@ -241,7 +241,24 @@ class MyCommercialSoftwarePackage(object):
def __init__(self): def __init__(self):
pass pass
def CheckPackage(self,main_screen):##detect zip files
ret = False
json_config = self._ComPkgInfo
if not json_config:
return ret
cur_dir = os.getcwd()
os.chdir(json_config["GameDir"])
if "MD5" in json_config:
for i,v in enumerate(json_config["MD5"]):
if FileExists(v):
ret = True
break
os.chdir(cur_dir)
return ret
def InstallPackage(self,main_screen): def InstallPackage(self,main_screen):
main_screen._MsgBox.SetText("Installing the package") main_screen._MsgBox.SetText("Installing the package")
main_screen._MsgBox.Draw() main_screen._MsgBox.Draw()
@ -286,7 +303,7 @@ class MyCommercialSoftwarePackage(object):
if "MD5" in json_config: if "MD5" in json_config:
for i,v in enumerate(json_config["MD5"]): for i,v in enumerate(json_config["MD5"]):
print(i,v) #print(i,v)
if FileExists( os.path.join(json_config["GameDir"], v )): if FileExists( os.path.join(json_config["GameDir"], v )):
print( os.path.join(json_config["GameDir"],v )) print( os.path.join(json_config["GameDir"],v ))
out = commands.getstatusoutput("md5sum %s" % os.path.join(json_config["GameDir"],v)) out = commands.getstatusoutput("md5sum %s" % os.path.join(json_config["GameDir"],v))
@ -328,7 +345,8 @@ class MyCommercialSoftwarePackage(object):
#### ####
else: else:
#print(self._ComPkgInfo) #print(self._ComPkgInfo)
if FileExists( os.path.join(self._ComPkgInfo["GameDir"],self._ComPkgInfo["InstallDir"] )) == False: #if FileExists( os.path.join(self._ComPkgInfo["GameDir"],self._ComPkgInfo["InstallDir"] )) == False:
if self.CheckPackage(main_screen) == False:
main_screen.PushPage(self._Page1) main_screen.PushPage(self._Page1)
main_screen.Draw() main_screen.Draw()
main_screen.SwapAndShow() main_screen.SwapAndShow()