Changeset 5215

Timestamp:

Jun 17, 2017, 12:19:51 AM (4 years ago)

Author:

Juanma

Message:

Avoid reload the cache when installing/uninstalling apps

Location:

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore

Files:

• plugins/infoManager.py (modified) (2 diffs)
• plugins/searchManager.py (modified) (5 diffs)
• storeManager.py (modified) (2 diffs)

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/plugins/infoManager.py

@@ -60 +60 @@
                         appInfo=self._init_appInfo()
 #                       self._debug("Gathering package info for "+app.get_id())
+                        appInfo['appstream_id']=app
                         if app.get_id():
                                 appInfo['id']=app.get_id()
@@ -168 +169 @@
 
         def _init_appInfo(self):
-                appInfo={'id':'',\
+                appInfo={'appstream_id':'',\
+                'id':'',\
                 'name':'',\
                 'version':'',\

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/plugins/searchManager.py

@@ -80 +80 @@
                         self._debug("App direct match found: "+app.get_id())
                 if not exact_match:
-                        applist=self._get_apps_by_match(tokens,applist)
+                        applist.extend(self._get_apps_by_match(tokens,applist))
+#               if len(applist):
+#                       self._set_status(0)
+#               else:
+                        applist.extend(self._get_app_by_pkgname(tokens,applist))
+                applist=set(applist)
                 if len(applist):
                         self._set_status(0)
                 else:
-                        applist=self._get_app_by_pkgname(tokens,applist)
-                        if len(applist):
-                                self._set_status(0)
-                        else:
-                                self._set_status(1)
+                        self._set_status(1)
                 self.result['data']=applist
                 return(applist)
@@ -158 +159 @@
         def _get_apps_by_match(self,tokens,applist=[]):
                 #Add items witch match >= self.precision
+                if not applist:
+                        insertPosition=1
+                else:
+                        insertPosition=len(applist)+1
                 apps_in_store=self.store.get_apps()
                 if apps_in_store:
@@ -170 +175 @@
                                                 score=app.search_matches(token)
                                                 if score>=self.precision:
+                                                        if "appimage" in app.get_id().lower():
+                                                                score=1
                                                         if score in auxDict:
                                                                 auxDict[score].append(app)
@@ -182 +189 @@
 
         def _get_app_by_pkgname(self,tokens,applist=[]):
+                if not applist:
+                        insertPosition=1
+                else:
+                        insertPosition=len(applist)+1
                 apps_in_store=self.store.get_apps()
                 if apps_in_store:
@@ -192 +203 @@
                                         for token in tokens:
                                                 if app.get_pkgname_default()==token:
-                                                        applist.append(app)
-
-                return(applist)
+                                                        applist.insert(1,app)
+
+                return(applist)

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/storeManager.py

@@ -419 +419 @@
                                 self._debug("Retrieving info for "+str(typeDict[package_type]))
                                 pkgInfoFunction=self._execute_class_method(action,package_type,launchedby)
-#                               result.update(pkgInfoFunction.execute_action(action,typeDict[package_type]))
+                                result.update(pkgInfoFunction.execute_action(action,typeDict[package_type]))
 #                               result['data'].extend(pkgInfoFunction.execute_action(action,typeDict[package_type])['data'])
 #                               result['status']=pkgInfoFunction.execute_action(action,typeDict[package_type])['status']
-                                result=pkgInfoFunction.execute_action(action,typeDict[package_type])
+#                               result=pkgInfoFunction.execute_action(action,typeDict[package_type])
                         else:
                                 result['data'].append(appInfo)
@@ -561 +561 @@
                                         result=installFunction.execute_action(action,typeDict[package_type])
                                         self.result[action]=result
+                                        if result['status']['status']==0:
+                                                #Mark the apps as installed or available
+                                                for app in typeDict[package_type]:
+                                                        if action=='install':
+                                                                app['appstream_id'].set_state(1)
+                                                                self._debug("App state changed to installed")
+                                                        else:
+                                                                app['appstream_id'].set_state(2)
+                                                                self._debug("App state changed to available")
                                         return_msg=True
-                        self._debug("Regenerating the cache...")
-                        self._load_Store()
+#                       self._debug("Regenerating the cache...")
+#                       self._load_Store()
                 self._log("Result "+action +": "+str(self.result[action]))
                 return(return_msg)