Changeset 4394 for lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr

Timestamp:

Apr 21, 2017, 2:59:21 PM (3 years ago)

Author:

Juanma

Message:

CLI: WIP on shManager

Location:

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

Files:

• plugins/infoManager.py (modified) (1 diff)
• plugins/loadStore.py (modified) (3 diffs)
• plugins/shManager.py (modified) (4 diffs)
• storeManager.py (modified) (2 diffs)

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

@@ -124 +124 @@
                         if app.get_url_item(1):
                                 appInfo['homepage']=app.get_url_item(1).strip()
+                        if app.get_url_item(0):
+                                appInfo['installerUrl']=app.get_url_item(0).strip()
                         if app.get_state()==1: #1=Installed
                                 appInfo['state']='installed'

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

@@ -78 +78 @@
                 uniqDict={}
                 for app in applist:
+                        #Prioritize Lliurex apps
+                        if str(app.get_origin()).find('lliurex')>=0:
+                                self._debug("Prioritize app "+str(app.get_id()))
+                                app.set_priority(100)
+                        elif app.has_category('Lliurex'):
+                                self._debug("Prioritize app "+app.get_id())
+                                app.set_priority(100)
+                        else:
+                                app.set_priority(0)
                         #Remove apps whitout pkgname
                         if not app.get_pkgnames():
@@ -101 +110 @@
                         elif pkg:
                                 uniqDict.update({pkg:{'fn':app.get_id_filename(),'app':app}})
+
                 #Check the blacklist
+                store=self._apply_blacklist(store)
+                return (store)
+        #def _sanitize_store
+
+        def _apply_blacklist(self,store):
                 try:
                         flavour=subprocess.check_output(["lliurex-version","-f"]).rstrip()
@@ -132 +147 @@
                                 self._debug('No blacklist to check')
                 except subprocess.CalledProcessError as e:
-                        print(u"Running on a non Lliurex host")
+                                self_debug("Running on a non Lliurex host")
                 except Exception as e:
                         self._debug("Error processing blacklist: "+str(e))
-                return (store)
-        #def _sanitize_store
+                finally:
+                        return(store)
+        #def _apply_blacklist
 

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

@@ -4 +4 @@
 import locale
 import tempfile
+import subprocess
+import urllib.request
+import shutil
+import time
 
 class shmanager:
-        def __init__(self,packagekit=None,action=None,app={}):
+        def __init__(self):
                 self.locale=locale.getlocale()[0]
                 self.dbg=0
                 self.pluginInfo={'install':'sh'}
-                if action=='install':
-                        self.install_App(app)
+                self.progress=0
+                self.result={}
+                self.result['data']=[]
+                self.result['status']={}
+                self.result['status']={'status':-1,'msg':''}
         #def __init__
 
         def set_debug(self,dbg='1'):
                 self.dbg=int(dbg)
-                self.debug ("Debug enabled")
+                self._debug ("Debug enabled")
         #def set_debug
 
-        def debug(self,msg=''):
+        def _debug(self,msg=''):
                 if self.dbg==1:
-                        print ('DEBUG Zmd: '+msg)
+                        print ('DEBUG Sh: '+msg)
         #def debug
 
@@ -29 +36 @@
 
         def execute_action(self,action,applist):
+                self.result['status']={'status':-1,'msg':''}
+                self.result['data'].append(applist)
                 count=len(applist)
                 if (action):
-                        if action=='install':
-                                self._install_App(appInfo)
+                        for appInfo in applist:
+                                self._debug("Executing action "+action+" for "+str(appInfo))
+                                if action=='install':
+                                        self.result['data'].append(self._install_App(appInfo))
                 self.progress=100
                 return(self.result)
         #def execute_action
 
+        def _set_status(self,status,msg=''):
+                self.result['status']={'status':status,'msg':msg}
+
+        def _callback(self,cmdLauncher):
+                inc=1
+                limit=99
+                margin=limit-self.progress
+                inc=round(margin/limit,3)
+                self.progress=self.progress+inc
+        #def _callback
+
         def _install_App(self,appInfo):
                 return_msg=False
-                appUrl=appinfo['installerUrl']
-                self.debug("Checking availabilty for "+appUrl)
+                appUrl=appInfo['installerUrl']
+                self._debug("Checking availabilty for "+appUrl)
                 tmpDir=tempfile.mkdtemp(None,None,'/tmp')
                 fileName=appUrl.split('/')[-1]
@@ -47 +69 @@
                         os.chdir(tmpDir)
                         os.chmod(dest_path, stat.S_IRUSR|stat.S_IWUSR|stat.S_IXUSR)
+                        err=0
+                        try:
+                                cmdsudo=['gksudo',dest_path]
+                                self._debug("executing "+str(cmdsudo))
+                                cmdCmd=subprocess.Popen(cmdsudo,stdout=subprocess.PIPE,stdin=subprocess.PIPE,stderr=subprocess.PIPE)
+                                cmdLauncher=os.path.basename(dest_path)
+                                cmdLauncher=os.path.splitext(cmdLauncher)[0]
+                                while cmdCmd.poll() is None:
+                                        self._callback(cmdLauncher)
+                                        time.sleep(0.4)
+                                cmdResult=cmdCmd.stdout.read()
+                                cmdError=cmdCmd.stderr.read()
+                                self._debug("Error: "+str(cmdError))
+                                self._debug("Result: "+str(cmdResult))
+                        except Exception as e:
+                                self._debug(str(e))
+                                err=12
+                else:
+                        err=11
+                self._set_status(err)
+                return err
         #def install_App
 
@@ -54 +97 @@
                         tmpDir=tempfile.mkdtemp(None,None,'/tmp')
                         dest_path=tmpDir+'/'+appUrl.split('/')[-1]
-                self.debug("Downloading "+appUrl+" to "+dest_path)      
+                self._debug("Downloading "+appUrl+" to "+dest_path)     
                 try:
-                        urllib.request.urlretrieve(appUrl,dest_path)
+                                #                       urllib.request.urlretrieve(appUrl,dest_path)
+                        with urllib.request.urlopen(appUrl) as response, open(dest_path, 'wb') as out_file:
+                                shutil.copyfileobj(response, out_file)
+
                         return_msg=True
                 except Exception as e:
-                        self.debug(str(e))
+                        self._debug(str(e))
                         return_msg=False
                 return return_msg

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

@@ -375 +375 @@
                 result['status']={'status':0,'msg':''}
                 for appInfo in applistInfo:
+                        result['data'].append(appInfo)
                         package_type=self._check_package_type(appInfo)
                         if package_type in typeDict:
@@ -531 +532 @@
                         return_msg="zmd"
                 else:
-                        if "Installer" in appInfo['categories']:
+                #Standalone installers must have an installerUrl field loaded from a bundle type=script description
+                        if appInfo['installerUrl']!='':
                                 return_msg="sh"
                         else: