Changeset 3852 for lliurex-store/trunk/fuentes/python3-lliurex-store.install

Timestamp:

Mar 9, 2017, 12:58:21 PM (2 years ago)

Author:

Juanma

Message:

wip

File:

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

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

@@ -273 +273 @@
                                 #put a 100% just in case
                                 if parentAction in self.progressActions.keys():
+#                                       if self.progressActions[parentAction]:
+#                                               self.progressActions[parentAction]=100
                                         self.progressActions[parentAction]=100
                 self.lock.release()
@@ -358 +360 @@
                 action='pkginfo'
                 typeDict={}
+                result=[]
                 for appInfo in applistInfo:
                         package_type=self._check_package_type(appInfo)
@@ -369 +372 @@
                                 #Only search deb's full info if it's required
                                 if (package_type=='deb' and fullsearch==False):
+                                        result=result+typeDict[package_type]
                                         continue
-#                               self._debug("Retrieving info for "+str(typeDict[package_type]))
-                                backup_applist=applistInfo
-                                try:
-                                        pkgInfoFunction=self._execute_class_method(action,package_type,launchedby)
-                                        applistInfo=pkgInfoFunction.execute_action(action,typeDict[package_type])['data']
-                                except:
-                                        applistInfo=backup_applist
-                return(applistInfo)
+                                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']
+                return(result)
         #def _get_Extended_App_Info
 
@@ -406 +406 @@
         #  - List of dicts with all the info
         ####
-        def _search_Store(self,searchItem='',action='search',fullsearch=False,launchedby=None,exact_match=True):
+        def _search_Store(self,searchItem='',action='search',fullsearch=False,launchedby=None):
                 applist={}
                 result={}
@@ -421 +421 @@
                 if not launchedby:
                         launchedby=action
-                #Set the exact match to false for search and list methods
-                if (launchedby=='search' or launchedby=='list'):
-                        exact_match=False
+                #Set the exact match to false for search method
+                exact_match=True
+                if (launchedby=='search'):
+                                exact_match=False
                 searchFunction=self._execute_class_method(action,'*',launchedby)
                 aux_result=searchFunction.execute_action(self.store,action,searchItem,exact_match)
@@ -509 +510 @@
                 #Standalone installers must have the subcategory "installer"
                 #Zomandos must have the subcategory "Zomando"
-#               self._debug("Checking package type for app "+appInfo['name'])
+                self._debug("Checking package type for app "+appInfo['name'])
                 if "Zomando" in appInfo['categories']:
                         return_msg="zmd"