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 #319 from cuu/master

Browse Source 
warehouse
This commit is contained in:
GNU 2019-12-29 00:47:17 +08:00 committed by GitHub
commit 7ea30feba7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Menu/GameShell/21_Warehouse/__init__.py
View File

@ -837,47 +837,46 @@ class GameStorePage(Page):
print("cur_li._Value",cur_li._Value) print("cur_li._Value",cur_li._Value)
if cur_li._Value["type"] == "source" or cur_li._Value["type"] == "dir": if cur_li._Value["type"] == "source" or cur_li._Value["type"] == "dir":
remote_file_url = cur_li._Value["file"] remote_file_url = cur_li._Value["file"]
menu_file = remote_file_url.split("raw.githubusercontent.com")[1] #assume master branch menu_file = remote_file_url.split("raw.githubusercontent.com")[1] #assume master branch
local_menu_file = "%s/aria2download%s" % (os.path.expanduser('~'),menu_file ) local_menu_file = "%s/aria2download%s" % (os.path.expanduser('~'),menu_file )
print(local_menu_file) print(local_menu_file)
if FileExists( local_menu_file ) == False: if FileExists( local_menu_file ) == False:
self.LoadHouse() self.LoadHouse()
else: else:
#read the local_menu_file, push into stack,display menu #read the local_menu_file, push into stack,display menu
self._Downloading = None self._Downloading = None
try: try:
with open(local_menu_file) as json_file: with open(local_menu_file) as json_file:
local_menu_json = json.load(json_file) local_menu_json = json.load(json_file)
print(local_menu_json) print(local_menu_json)
self._MyStack.Push(local_menu_json["list"]) self._MyStack.Push(local_menu_json["list"])
self.SyncList() self.SyncList()
self._Screen.Draw() self._Screen.Draw()
self._Screen.SwapAndShow() self._Screen.SwapAndShow()
except Exception as ex: except Exception as ex:
print(ex) print(ex)
self._Screen._MsgBox.SetText("Open house failed ") self._Screen._MsgBox.SetText("Open house failed ")
self._Screen._MsgBox.Draw() self._Screen._MsgBox.Draw()
self._Screen.SwapAndShow() self._Screen.SwapAndShow()
elif cur_li._Value["type"] == "add_house": elif cur_li._Value["type"] == "add_house":
print("show keyboard to add ware house") print("show keyboard to add ware house")
self._Screen.PushCurPage() self._Screen.PushCurPage()
self._Screen.SetCurPage( self._Keyboard ) self._Screen.SetCurPage( self._Keyboard )
else: else:
#download the game probably #download the game probably
remote_file_url = cur_li._Value["file"] remote_file_url = cur_li._Value["file"]
menu_file = remote_file_url.split("raw.githubusercontent.com")[1] menu_file = remote_file_url.split("raw.githubusercontent.com")[1]
local_menu_file = "%s/aria2download%s" % (os.path.expanduser('~'),menu_file ) local_menu_file = "%s/aria2download%s" % (os.path.expanduser('~'),menu_file )
if FileExists( local_menu_file ) == False: if FileExists( local_menu_file ) == False:
gid,ret = config.RPC.urlDownloading(remote_file_url) gid,ret = config.RPC.urlDownloading(remote_file_url)
if ret == False: if ret == False:
gid = config.RPC.addUri( remote_file_url, options={"out": menu_file}) gid = config.RPC.addUri( remote_file_url, options={"out": menu_file})
self._Downloading = gid self._Downloading = gid
print("stack length ",self._MyStack.Length()) print("stack length ",self._MyStack.Length())
""" """
if self._MyStack.Length() > 1:## not on the top list page if self._MyStack.Length() > 1:## not on the top list page
@ -894,13 +893,12 @@ class GameStorePage(Page):
else: else:
print(config.RPC.tellStatus(gid,["status","totalLength","completedLength"])) print(config.RPC.tellStatus(gid,["status","totalLength","completedLength"]))
self._Screen._MsgBox.SetText("Getting the game now") self._Screen._MsgBox.SetText("Getting the game now")
self._Screen._MsgBox.Draw() self._Screen._MsgBox.Draw()
self._Screen.SwapAndShow() self._Screen.SwapAndShow()
pygame.time.delay(800)
self._Screen._TitleBar.Redraw()
pygame.time.delay(800)
self._Screen._TitleBar.Redraw()
else: else:
print("file downloaded")# maybe check it if is installed,then execute it print("file downloaded")# maybe check it if is installed,then execute it