NotificationsYou must be signed in to change notification settings
Fork12
Star239

Commit984d644

committed

AppStore app: use update_ui_threadsafe_if_foreground

1 parent72947af commit984d644Copy full SHA for 984d644

File tree

2 files changed

-21

lines changed

internal_filesystem
- builtin/apps/com.micropythonos.appstore/assets
  - appstore.py
- lib/mpos/app
  - activity.py

2 files changed

-21

lines changed

`‎internal_filesystem/builtin/apps/com.micropythonos.appstore/assets/appstore.py‎`

Lines changed: 8 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ class AppStore(Activity):`
`16`	`16`	`apps= []`
`17`	`17`	`app_index_url="https://apps.micropythonos.com/app_index.json"`
`18`	`18`	`can_check_network=True`
`19`		`-keep_running=False`
`20`	`19`
`21`	`20`	`# Widgets:`
`22`	`21`	`main_screen=None`
`@@ -34,7 +33,7 @@ def onCreate(self):`
`34`	`33`	`self.setContentView(self.main_screen)`
`35`	`34`
`36`	`35`	`defonResume(self,screen):`
`37`		`-self.keep_running=True`
	`36`	`+super().onResume(screen)`
`38`	`37`	`iflen(self.apps):`
`39`	`38`	`return# already downloaded them`
`40`	`39`	`try:`
`@@ -47,16 +46,12 @@ def onResume(self, screen):`
`47`	`46`	`_thread.stack_size(mpos.apps.good_stack_size())`
`48`	`47`	`_thread.start_new_thread(self.download_app_index, (self.app_index_url,))`
`49`	`48`
`50`		`-defonStop(self,screen):`
`51`		`-self.keep_running=False`
`52`		`-`
`53`	`49`	`defdownload_app_index(self,json_url):`
`54`	`50`	`try:`
`55`	`51`	`response=requests.get(json_url,timeout=10)`
`56`	`52`	`exceptExceptionase:`
`57`	`53`	`print("Download failed:",e)`
`58`		`-ifself.keep_running:`
`59`		`-lv.async_call(lambdal,error=e:self.please_wait_label.set_text(f"App index download\n{json_url}\ngot error:{error}"),None)`
	`54`	`+self.update_ui_threadsafe_if_foreground(self.please_wait_label.set_text,f"App index download\n{json_url}\ngot error:{e}")`
`60`	`55`	`return`
`61`	`56`	`ifresponseandresponse.status_code==200:`
`62`	`57`	`#print(f"Got response text: {response.text}")`
`@@ -73,9 +68,8 @@ def download_app_index(self, json_url):`
`73`	`68`	`# Sort apps by app.name`
`74`	`69`	`self.apps.sort(key=lambdax:x.name.lower())# Use .lower() for case-insensitive sorting`
`75`	`70`	`time.sleep_ms(200)`
`76`		`-ifself.keep_running:`
`77`		`-lv.async_call(lambdal:self.please_wait_label.add_flag(lv.obj.FLAG.HIDDEN),None)`
`78`		`-lv.async_call(lambdal:self.create_apps_list(),None)`
	`71`	`+self.update_ui_threadsafe_if_foreground(self.please_wait_label.add_flag,lv.obj.FLAG.HIDDEN)`
	`72`	`+self.update_ui_threadsafe_if_foreground(self.create_apps_list)`
`79`	`73`	`exceptExceptionase:`
`80`	`74`	`print(f"ERROR: could not parse reponse.text JSON:{e}")`
`81`	`75`	`finally:`
`@@ -91,6 +85,7 @@ def create_apps_list(self):`
`91`	`85`	`apps_list.set_size(lv.pct(100),lv.pct(100))`
`92`	`86`	`print("create_apps_list iterating")`
`93`	`87`	`forappinself.apps:`
	`88`	`+print(app)`
`94`	`89`	`item=apps_list.add_button(None,"Test")`
`95`	`90`	`item.set_style_pad_all(0,0)`
`96`	`91`	`#item.set_style_border_width(0, 0)`
`@@ -126,7 +121,7 @@ def create_apps_list(self):`
`126`	`121`	`print("create_apps_list app done")`
`127`	`122`	`try:`
`128`	`123`	`_thread.stack_size(mpos.apps.good_stack_size())`
`129`		`-_thread.start_new_thread(self.download_icons,())`
	`124`	`+_thread.start_new_thread(self.download_icons,())# maybe there's no need for a new thread here, just do it in download_app_index()?`
`130`	`125`	`exceptExceptionase:`
`131`	`126`	`print("Could not start thread to download icons: ",e)`
`132`	`127`
`@@ -135,17 +130,13 @@ def download_icons(self):`
`135`	`130`	`ifapp.image_dsc:`
`136`	`131`	`print(f"Skipping icon download for{app.name} because already downloaded.")`
`137`	`132`	`continue`
`138`		`-ifnotself.keep_running:`
	`133`	`+ifnotself.has_foreground():`
`139`	`134`	`print(f"App is stopping, aborting icon downloads.")`
`140`	`135`	`break`
`141`	`136`	`print(f"Downloading icon for{app.name}")`
`142`	`137`	`image_dsc=self.download_icon(app.icon_url)`
`143`	`138`	`app.image_dsc=image_dsc# save it for the app detail page`
`144`		`-ifnotself.keep_running:`
`145`		`-print(f"App is stopping, aborting all icon downloads.")`
`146`		`-break`
`147`		`-else:`
`148`		`-lv.async_call(lambdal:app.image.set_src(image_dsc),None)`
	`139`	`+self.update_ui_threadsafe_if_foreground(app.image.set_src,image_dsc)`
`149`	`140`	`time.sleep_ms(200)# not waiting here will result in some async_calls() not being executed`
`150`	`141`	`print("Finished downloading icons.")`
`151`	`142`

`‎internal_filesystem/lib/mpos/app/activity.py‎`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,4 @@ def if_foreground(self, func, args, *kwargs):`
`73`	`73`	`# Update the UI in a threadsafe way if the Activity is in the foreground`
`74`	`74`	`defupdate_ui_threadsafe_if_foreground(self,func,args,*kwargs):`
`75`	`75`	`# lv.async_call() is needed to update the UI from another thread than the main one (as LVGL is not thread safe)`
`76`		`-lv.async_call(`
`77`		`-lambda_:self.if_foreground(func,args,*kwargs),`
`78`		`-None`
`79`		`- )`
	`76`	`+lv.async_call(lambda_:self.if_foreground(func,args,*kwargs),None)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit984d644

File tree

2 files changed

2 files changed

`‎internal_filesystem/builtin/apps/com.micropythonos.appstore/assets/appstore.py‎`

`‎internal_filesystem/lib/mpos/app/activity.py‎`

0 commit comments