Changeset 3839

Timestamp:

Mar 8, 2017, 5:08:19 PM (2 years ago)

Author:

Juanma

Message:

wip

Location:

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

Files:

• plugins/debManager.py (modified) (5 diffs)
• storeManager.py (modified) (3 diffs)

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

@@ -41 +41 @@
                 self.installer=packagekit.Client()
                 self.count=len(applist)
-                self._set_status(-1)
+                self.result['status']={'status':-1,'msg':''}
+                self.result['data']=[]
                 processedPkg=[]
                 #1.- If the app doesn't exist cancel the action
@@ -53 +54 @@
                                         if action=='remove':
                                                 self._log("Removing "+appInfo['package'])
-                                                self._get_App_Dependencies(appInfo,app)
+                                                self._get_App_Extended_Info(appInfo,app)
                                                 self._log("Dependencies to remove"+str(appInfo['depends']))
                                                 self._remove_App(app)
@@ -110 +111 @@
                         results=pkTask.get_depends(1,[app.get_id(),],True,None,self._fake_callback,None)
                 except:
+                        self._set_status(1)
                         pass
                 if (results):
                         for app in results.get_package_array():
                                 dependsList.append(app.get_id())
-                appInfo['depends']=dependsList
-                appInfo['version']=app.get_version()
+                        appInfo['depends']=dependsList
+                        appInfo['version']=app.get_version()
 #               appInfo['size']=app.get_size()
 #               return(dependsList)
+                        self.result['data'].append(appInfo)
+                        self._set_status(0)
                 return(appInfo)
         #def _get_App_Dependencies
@@ -128 +132 @@
                 if appsCount==1:
                         self._debug("loading extended info")
-                        self._get_App_Extended_Info(appInfo,app)
+                        appInfo=self._get_App_Extended_Info(appInfo,app)
                 self.partialProgress=100
                 self.result.append(appInfo)
+#               self.result['data'].update({appInfo['package']:appInfo})
+                self._set_status(0)
                 return(appInfo)
         #def _get_App_Info
@@ -141 +147 @@
                 try:
                         result=self.installer.resolve(1,[appName,],None,self._fake_callback, None)
-                        print("********************")
-                        res2=self.installer.get_details([appName,],None,self._fake_callback, None)
-                        print(res2)
-                        print("********************")
+#                       print("********************")
+#                       res2=self.installer.get_details([appName,],None,self._fake_callback, None)
+#                       print(res2)
+#                       print("********************")
                         applist=result.get_package_array()
                         if applist:

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

@@ -301 +301 @@
                         if action in self.result:
                                 result[action]=self.result[action]['data']
+                                print (result[action])
+                                print("++++++++++++++++")
                 self.lock.release()
                 return(result)
@@ -371 +373 @@
                                 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)
-                                pkgInfoFunction.execute_action(action,typeDict[package_type])
+                                applistInfo=pkgInfoFunction.execute_action(action,typeDict[package_type])['data']
                 return(applistInfo)
         #def _get_Extended_App_Info
@@ -404 +407 @@
         def _search_Store(self,searchItem='',action='search',fullsearch=False,launchedby=None):
                 applist={}
+                result={}
                 aux_applist=[]
                 if action=='list':