Changeset 3848

Timestamp:

Mar 9, 2017, 12:32:07 PM (3 years ago)

Author:

Juanma

Message:

wip

Location:

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

Files:

• plugins/debManager.py (modified) (1 diff)
• plugins/infoManager.py (modified) (1 diff)
• plugins/zmdManager.py (modified) (2 diffs)
• storeManager.py (modified) (5 diffs)

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

@@ -126 +126 @@
 
         def _get_App_Info(self,appInfo,app,appsCount=0):
-                info=app.get_info()
-                appInfo['status']=info.to_string(info)
-                self._debug("Status: "+appInfo['status'])
+                try:
+                        info=app.get_info()
+                        appInfo['status']=info.to_string(info)
+                        self._debug("Status: "+appInfo['status'])
+                except:
+                        self._debug("Status: not available")
+                        pass
                 #Only search dependencies if there's only one package on the package queue
                 if appsCount==1:

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

@@ -53 +53 @@
                 for app in applist:
                         appInfo=self._init_appInfo()
-                        self._debug("Gathering package info for "+app.get_id())
+#                       self._debug("Gathering package info for "+app.get_id())
                         if app.get_id():
                                 appInfo['id']=app.get_id()

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

@@ -18 +18 @@
                 self.n4dclient=''
                 self.result={}
-                self.result['data']={}
+                self.result['data']=[]
                 self.result['status']={}
         #def __init__
@@ -168 +168 @@
                                 if n4dvars[key]['state']==1:
                                         appInfo['status']='Installed'
+
+                self._set_status(6)
+                self.result['data'].append(appInfo)
                 return(appInfo)
         #def _get_Zmd_Info

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()
@@ -372 +370 @@
                                 if (package_type=='deb' and fullsearch==False):
                                         continue
-                                self._debug("Retrieving info for "+str(typeDict[package_type]))
-                                pkgInfoFunction=self._execute_class_method(action,package_type,launchedby)
-                                applistInfo=pkgInfoFunction.execute_action(action,typeDict[package_type])['data']
+#                               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)
         #def _get_Extended_App_Info
@@ -404 +406 @@
         #  - List of dicts with all the info
         ####
-        def _search_Store(self,searchItem='',action='search',fullsearch=False,launchedby=None):
+        def _search_Store(self,searchItem='',action='search',fullsearch=False,launchedby=None,exact_match=True):
                 applist={}
                 result={}
@@ -419 +421 @@
                 if not launchedby:
                         launchedby=action
-                #Set the exact match to false for search method
-                exact_match=True
-                if (launchedby=='search'):
-                                exact_match=False
+                #Set the exact match to false for search and list methods
+                if (launchedby=='search' or launchedby=='list'):
+                        exact_match=False
                 searchFunction=self._execute_class_method(action,'*',launchedby)
                 aux_result=searchFunction.execute_action(self.store,action,searchItem,exact_match)
@@ -508 +509 @@
                 #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"