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

Timestamp:

Apr 20, 2017, 1:48:50 PM (4 years ago)

Author:

Juanma

Message:

Refactorized search method and related plugins

File:

• lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/storeManager.py (modified) (9 diffs)

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

@@ -96 +96 @@
                         syslog.openlog('lliurex-store')
                         syslog.syslog(msg)
+                        self._debug(msg)
         ####
         #dict of actions/related functions for threading
@@ -294 +295 @@
                         for res in self.result.keys():
                                 if res!='load':
-                                        result[res]=self.result[res]['data']
+                                        if 'data' in self.result[res]:
+                                                result[res]=self.result[res]['data']
+                                        else:
+                                                result[res]=[]
                 else:
                         self._debug("Checking result for action "+action)
@@ -301 +305 @@
                         result[action]=None
                         if action in self.result:
-                                result[action]=self.result[action]['data']
+                                if 'data' in self.result[action]:
+                                        result[action]=self.result[action]['data']
+                                else:
+                                        result[action]=[]
                 self.lock.release()
                 return(result)
@@ -315 +322 @@
         def get_status(self,action=None):
                 self.lock.acquire()
-
+                self._debug("Checking status for action "+str(action))
                 result={}
                 if action in self.result:
@@ -364 +371 @@
                 action='pkginfo'
                 typeDict={}
-                result=[]
+                result={}
+                result['data']=[]
+                result['status']={'status':0,'msg':''}
                 for appInfo in applistInfo:
                         package_type=self._check_package_type(appInfo)
@@ -374 +383 @@
                         self._debug("Checking plugin for "+action+ " "+package_type)
                         if package_type in self.registeredPlugins[action]:
-                                #Only search deb's full info if it's required
-                                if (package_type=='deb' and fullsearch==False):
-                                        result=result+typeDict[package_type]
+                                #Only search full info if it's required
+                                if (fullsearch==False):
+                                        result['data'].extend(typeDict[package_type])
                                         continue
                                 self._debug("Retrieving info for "+str(typeDict[package_type]))
                                 pkgInfoFunction=self._execute_class_method(action,package_type,launchedby)
-                                result=result+pkgInfoFunction.execute_action(action,typeDict[package_type])['data']
+                                result.update(pkgInfoFunction.execute_action(action,typeDict[package_type]))
                 return(result)
         #def _get_Extended_App_Info
@@ -430 +439 @@
                                 exact_match=False
                 searchFunction=self._execute_class_method(action,'*',launchedby)
-                aux_result=searchFunction.execute_action(self.store,action,searchItem,exact_match)
-                aux_applist=aux_result['data']
-                status=aux_result['status']
+                result=searchFunction.execute_action(self.store,action,searchItem,exact_match)
+                aux_applist=result['data']
+                status=result['status']
                 realAction=action
                 if status['status']==0:
@@ -438 +447 @@
                         partialAction='get_info'
                         self.result[partialAction]={}
-                        applist=self._get_App_Info(aux_applist,launchedby)
+                        result=self._get_App_Info(aux_applist,launchedby)
                         self._debug("Add result for "+partialAction)
-                        self.result[partialAction]['data']=applist
+                        self.result[partialAction]=result
                         #2.- Get rest of metadata (slower)
                         partialAction='pkginfo'
-                        applist=self._get_Extended_App_Info(applist,launchedby,fullsearch)
+                        result=self._get_Extended_App_Info(result['data'],launchedby,fullsearch)
                         if launchedby:
                                 realAction=launchedby
                                 self._debug("Assigned results of "+action+" to "+realAction)
-                        if (len(applist)):
+                        if (result['status']['status']==0) or (result['status']['status']==9):
                                 return_msg=True
+                                if fullsearch:
+                                        result['status']['status']=0
                         else:
                                 return_msg=False
                 else:
                         return_msg=False
-                self.result[launchedby]['data']=applist
-                self.result[launchedby]['status']=status
+                self.result[launchedby]['data']=result['data']
+                self.result[launchedby]['status']=result['status']
                 return(return_msg)
         #def _search_Store
@@ -466 +477 @@
         ####
         def _install_remove_App(self,appName,action='install',launchedby=None):
-                self._debug("Attempting to "+action +" "+appName)
                 self._log("Attempting to "+action +" "+appName)
                 result={}