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

Timestamp:

May 15, 2017, 12:53:26 PM (3 years ago)

Author:

Juanma

Message:

Added zmd needed deb checking.
Zomandos added with max priority to the store
Merge appinfo when debs are distributed also as zomandos

File:

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

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

@@ -46 +46 @@
         def execute_action(self,action,applist):
                 self.result['status']={'status':-1,'msg':''}
-                self.result['data']=list(applist)
+#               self.result['data']=list(applist)
+                self.result['data']=''
                 if self.disabled:
                         self._set_status(9)
@@ -52 +53 @@
                         count=len(applist)
                         try:
+                                dataList=[]
                                 self.n4dclient=self._n4d_connect()
                                 for appInfo in applist:
                                         if (action):
                                                 if action=='install':
-                                                        self.result['data'].append(self._install_Zmd(appInfo))
+                                                        dataList.append(self._install_Zmd(appInfo))
+#                                                       self.result['data'].append(self._install_Zmd(appInfo))
                                                 if action=='remove':
-                                                        self.result['data'].append(self._remove_Zmd(appInfo))
+                                                        dataList.append(self._remove_Zmd(appInfo))
+#                                                       self.result['data'].append(self._remove_Zmd(appInfo))
                                                 if action=='pkginfo':
-                                                        self.result['data'].append(self._get_Zmd_Info(appInfo))
+                                                        dataList.append(self._get_Zmd_Info(appInfo))
+#                                                       self.result['data'].append(self._get_Zmd_Info(appInfo))
                         except:
                                 self.disabled=True
                                 self._set_status(10)
+                self.result['data']=list(dataList)
                 self.progress=100
                 return(self.result)
@@ -70 +76 @@
         def _set_status(self,status,msg=''):
                 self.result['status']={'status':status,'msg':msg}
+#               dataList['status']={'status':status,'msg':msg}
         
         def _callback(self,zmdLauncher):
@@ -85 +92 @@
                 zmd=self.zmdPath+'/'+appInfo['package']+'.zmd'
                 self._debug("Installing "+str(zmd))
-                if os.path.exists(zmd):
-                        err=0
-                        try:
-                                zmdsudo=['gksudo',zmd]
-                                self._debug("executing "+str(zmdsudo))
-                                zmdCmd=subprocess.Popen(zmdsudo,stdout=subprocess.PIPE,stdin=subprocess.PIPE,stderr=subprocess.PIPE)
-                                zmdLauncher=os.path.basename(zmd)
-                                zmdLauncher=os.path.splitext(zmdLauncher)[0]
-                                while zmdCmd.poll() is None:
-                                        self._callback(zmdLauncher)
-                                        time.sleep(0.4)
-                                zmdResult=zmdCmd.stdout.read()
-                                zmdError=zmdCmd.stderr.read()
-                                self._debug("Error: "+str(zmdError))
-                                self._debug("Result: "+str(zmdResult))
-                                appInfo=self._get_Zmd_Info(appInfo)
-                                if appInfo['status']!='Installed':
-                                        err=5
-                        except Exception as e:
-                                appInfo=self._get_Zmd_Info(appInfo)
-                                self._debug(str(e))
-                                if appInfo['status']!='Installed':
-                                        err=5
+                appInfo=self._get_Zmd_Info(appInfo)
+                if appInfo['state']=='Installed':
+                        err=4
                 else:
-                        err=8
+                        if os.path.exists(zmd):
+                                err=0
+                                try:
+                                        zmdsudo=['gksudo',zmd]
+                                        self._debug("executing "+str(zmdsudo))
+                                        zmdCmd=subprocess.Popen(zmdsudo,stdout=subprocess.PIPE,stdin=subprocess.PIPE,stderr=subprocess.PIPE)
+                                        zmdLauncher=os.path.basename(zmd)
+                                        zmdLauncher=os.path.splitext(zmdLauncher)[0]
+                                        while zmdCmd.poll() is None:
+                                                self._callback(zmdLauncher)
+                                                time.sleep(0.4)
+                                        zmdResult=zmdCmd.stdout.read()
+                                        zmdError=zmdCmd.stderr.read()
+                                        self._debug("Error: "+str(zmdError))
+                                        self._debug("Result: "+str(zmdResult))
+                                except Exception as e:
+                                        self._debug(str(e))
+                                finally:
+                                        appInfo=self._get_Zmd_Info(appInfo)
+                                        if appInfo['state']!='Installed':
+                                                err=5
+                        else:
+                                err=8
                 self._set_status(err)
-                return err
+                return(appInfo)
         #def _install_Zmd
 
@@ -172 +181 @@
                         if appInfo['status']=='Installed':
                                 err=6
-                        self._set_status(err)
                         os.remove(zeroScript)
-                        return err
+                else:
+                        err=6
+                self._set_status(err)
+                return(appInfo)
         #def _remove_Zmd
 
@@ -187 +198 @@
                                         if zmd.lower() in key.lower():
                                                 if n4dvars[key]['state']==1:
-                                                        appInfo['status']='Installed'
+                                                        appInfo['state']='Installed'
                         else:
-                                self._set_status(0)
+                                self._set_status(2)
                 except:
                         self._set_status(10)