Changeset 4417

Timestamp:

Apr 25, 2017, 2:46:39 PM (2 years ago)

Author:

Juanma

Message:

ShManager? major update

Location:

lliurex-store/trunk/fuentes

Files:

• lliurex-store-cli/usr/share/lliurex-store/files/error.json (modified) (1 diff)
• lliurex-store-cli/usr/share/lliurex-store/lliurex-store-cli.py (modified) (2 diffs)
• python3-lliurex-store.install/usr/share/lliurexstore/plugins/loadStore.py (modified) (4 diffs)
• python3-lliurex-store.install/usr/share/lliurexstore/plugins/shManager.py (modified) (7 diffs)
• python3-lliurex-store.install/usr/share/lliurexstore/storeManager.py (modified) (2 diffs)

lliurex-store/trunk/fuentes/lliurex-store-cli/usr/share/lliurex-store/files/error.json

@@ -12 +12 @@
         "9":"plugin disabled",
         "10":"unable to initialize n4d client",
+        "11":"no space left on device",
+        "12":"url not found",
         "262":"version mismatch",
         "264":"already installed",

lliurex-store/trunk/fuentes/lliurex-store-cli/usr/share/lliurex-store/lliurex-store-cli.py

@@ -35 +35 @@
                                         print (_(u"Results for ")+_(action))
                                         for data in results[action]:
-                                                print (data)
                                                 if action=='info':
                                                         try:
@@ -159 +158 @@
                 for progress in progressDic:
                         if progress!='load':
-                                progressArray.append(progress+': '+str(int(progressDic[progress]))+'%')
+                                progressArray.append(_(progress)+': '+str(int(progressDic[progress]))+'%')
                 print(','.join(progressArray),end="\r")
                 time.sleep(0.1)

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

@@ -77 +77 @@
                 applist=store.get_apps()
                 uniqDict={}
+                lliurexApps={}
                 for app in applist:
                         #Prioritize Lliurex apps
@@ -82 +83 @@
                                 self._debug("Prioritize app "+str(app.get_id()))
                                 app.set_priority(100)
+                                lliurexApps.update({app.get_id_filename():app})
                         elif app.has_category('Lliurex'):
                                 self._debug("Prioritize app "+app.get_id())
                                 app.set_priority(100)
+                                lliurexApps.update({app.get_id_filename():app})
                         else:
                                 app.set_priority(0)
+                                if app.get_id_filename() in lliurexApps.keys():
+#                                       app.set_merge_kind(appstream.AppMergeKind.APPEND)
+                                        self._debug("Mergin app "+str(app.get_id())+" as is in Lliurex")
+#                                       app.set_id(lliurexApps[app.get_id_filename()])
+                                        lliurexApps[app.get_id_filename()].subsume_full(app,appstream.AppSubsumeFlags.BOTH_WAYS)
+                                        store.remove_app(app)
+#                                       store.remove_app(app)
                         #Remove apps whitout pkgname
                         if not app.get_pkgnames():
@@ -98 +108 @@
                         pkg=app.get_pkgname_default()
                         if pkg in uniqDict.keys():
-                                fn=app.get_id_filename()
+                                fn=app.get_id_no_prefix()
                                 self._debug("Comparing "+fn+" with "+uniqDict[pkg]['fn'])
                                 if fn != uniqDict[pkg]['fn']:
@@ -106 +116 @@
                                         else:
                                                 self._debug("Removed duplicated "+uniqDict[pkg]['app'].get_id())
+                                                uniqDict.update({pkg:{'fn':app.get_id_no_prefix(),'app':app}})
                                                 store.remove_app(uniqDict[pkg]['app'])
-                                                uniqDict.update({pkg:{'fn':app.get_id_filename(),'app':app}})
                         elif pkg:
                                 uniqDict.update({pkg:{'fn':app.get_id_filename(),'app':app}})

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

@@ -13 +13 @@
                 self.locale=locale.getlocale()[0]
                 self.dbg=0
-                self.pluginInfo={'install':'sh'}
+                self.pluginInfo={'install':'sh','pkginfo':'sh'}
                 self.progress=0
                 self.result={}
@@ -37 +37 @@
         def execute_action(self,action,applist):
                 self.result['status']={'status':-1,'msg':''}
-                self.result['data'].append(applist)
+#               self.result['data'].append(applist)
                 count=len(applist)
                 if (action):
@@ -44 +44 @@
                                 if action=='install':
                                         self.result['data'].append(self._install_App(appInfo))
+                                if action=='pkginfo':
+                                        self.result['data'].append(self._get_Sh_Info(appInfo))
                 self.progress=100
                 return(self.result)
@@ -51 +53 @@
                 self.result['status']={'status':status,'msg':msg}
 
-        def _callback(self,cmdLauncher):
-                inc=1
+        def _callback(self,partialSize=0,totalSize=0):
                 limit=99
-                margin=limit-self.progress
-                inc=round(margin/limit,3)
-                self.progress=self.progress+inc
+                if partialSize!=0 and totalSize!=0:
+                        inc=round(partialSize/totalSize,2)*100
+                        self.progress=inc
+                else:
+                        inc=1
+                        margin=limit-self.progress
+                        inc=round(margin/limit,3)
+                        self.progress=(self.progress+inc)
+                if (self.progress>limit):
+                        self.progress=limit
         #def _callback
 
@@ -74 +82 @@
                                 self._debug("executing "+str(cmdsudo))
                                 cmdCmd=subprocess.Popen(cmdsudo,stdout=subprocess.PIPE,stdin=subprocess.PIPE,stderr=subprocess.PIPE)
+#                               cmdCmd=subprocess.check_output(cmdsudo)
                                 cmdLauncher=os.path.basename(dest_path)
                                 cmdLauncher=os.path.splitext(cmdLauncher)[0]
                                 while cmdCmd.poll() is None:
-                                        self._callback(cmdLauncher)
+                                        self._callback()
                                         time.sleep(0.4)
+                                if cmdCmd.poll():
+                                        if cmdCmd.poll()==255:
+                                                err=303
+                                        else:
+                                                err=cmdCmd.poll()
                                 cmdResult=cmdCmd.stdout.read()
                                 cmdError=cmdCmd.stderr.read()
                                 self._debug("Error: "+str(cmdError))
                                 self._debug("Result: "+str(cmdResult))
+                        except subprocess.CalledProcessError as callError:
+#                               err=callError.returncode
+                                #if gksudo fails set "permission denied" error
+                                err=303
                         except Exception as e:
                                 self._debug(str(e))
@@ -99 +117 @@
                 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)
-
+                                bf=16*1024
+                                acumbf=0
+                                shSize=int(response.info()['Content-Length'])
+                                while True:
+                                        if acumbf>=shSize:
+                                                break
+                                        shutil.copyfileobj(response, out_file,bf)
+                                        acumbf=acumbf+bf
+                                        self._callback(acumbf,shSize)
                         return_msg=True
                 except Exception as e:
@@ -109 +134 @@
                 return return_msg
         #def _download_App
+
+        def _get_Sh_Info(self,appInfo):
+                appUrl=appInfo['installerUrl']
+                self._debug("Connecting to "+appUrl)
+                appUrl.strip()
+                try:
+                        info=urllib.request.urlopen(appUrl) 
+                        appInfo['size']=info.info()['Content-Length']
+                        err=0
+                except:
+                        err=11
+                self._set_status(err)
+                return(appInfo)
+
+        #def _get_info
+

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

@@ -384 +384 @@
                         self._debug("Checking plugin for "+action+ " "+package_type)
                         if package_type in self.registeredPlugins[action]:
+#                               result['data']=[]
                                 #Only search full info if it's required
                                 if (fullsearch==False):
-                                        result['data'].extend(typeDict[package_type])
+#                                       result['data'].extend(typeDict[package_type])
                                         continue
                                 self._debug("Retrieving info for "+str(typeDict[package_type]))
@@ -513 +514 @@
                                         return_msg=True
                         self._debug("Regenerating the cache...")
-                        self._load_Store()
+#                       self._load_Store()
                 self._log("Result "+action +": "+str(self.result[action]))
                 return(return_msg)