Changeset 4962 for lliurex-store/trunk/fuentes

Timestamp:

May 30, 2017, 10:28:50 AM (2 years ago)

Author:

Juanma

Message:

remove duplicated debs when there's a zmd managing the deb installation

Location:

lliurex-store/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• python3-lliurex-store.install/usr/share/lliurexstore/plugins/loadStore.py (modified) (2 diffs)
• python3-lliurex-store.install/usr/share/lliurexstore/plugins/zmdManager.py (modified) (2 diffs)
• python3-lliurex-store.install/usr/share/lliurexstore/storeManager.py (modified) (2 diffs)

lliurex-store/trunk/fuentes/debian/changelog

@@ +1 @@
+lliurex-store (0.2.10.lliurex4) xenial; urgency=medium
+
+  * Purged all zmd-deb duplicated apps (I hope...)
+
+ -- Juanma Navarro Mañez <juanma1980@gmail.com>  Tue, 30 May 2017 10:23:13 +0200
+
 lliurex-store (0.2.10.lliurex3) xenial; urgency=medium
 

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

@@ -81 +81 @@
                 uniqDict={}
                 lliurexApps={}
+                zmdList=[]
                 for app in applist:
                         #Zomandos get max priority
-                        if app.has_category('zomando'):
+                        if app.has_category('Zomando'):
                                 self._debug("Prioritize zmd "+str(app.get_id()))
                                 app.set_priority(400)
                                 lliurexApps.update({app.get_id_filename():app})
+                                id=str(app.get_id_filename()).replace('zero-lliurex-','')
+                                zmdList.append(id)
                         #Prioritize Lliurex apps
                         elif app.has_category('Lliurex'):
@@ -126 +129 @@
                                                 store.remove_app(uniqDict[pkg]['app'])
                         elif pkg:
+                                self._debug("Adding "+app.get_id_filename()+" to uniq dict")
                                 uniqDict.update({pkg:{'fn':app.get_id_filename(),'app':app}})
-
+                #Delete zomando-related debs
+                store=self._purge_zomandos(zmdList,store)
                 #Check the blacklist
                 store=self._apply_blacklist(store)
                 return (store)
         #def _sanitize_store
+
+        def _purge_zomandos(self,zmdList,store):
+                for appId in zmdList:
+                        self._debug("Searching debs related to "+appId)
+                        purgeList=store.get_apps_by_id(appId)
+                        purgeList.extend(store.get_apps_by_id(appId+".desktop"))
+                        for purgeApp in purgeList:
+                                if purgeApp:
+                                        if not purgeApp.has_category('Zomando'):
+                                                self._debug("Removed related zomando app "+str(purgeApp.get_categories()))
+                                                store.remove_app(purgeApp)
+                return(store)
+        #def _purge_zomandos
 
         def _apply_blacklist(self,store):

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

@@ -192 +192 @@
         def _get_Zmd_Info(self,appInfo):
                 zmd=appInfo['package']
-                appInfo['state']='available'
+                appInfo['state']='Available'
                 try:
                         n4dvars=self.n4dclient.get_variable("","VariablesManager","ZEROCENTER")
@@ -199 +199 @@
                                 for key in n4dvars:
                                         if zmd.lower() in key.lower():
-                                                if n4dvars[key]['state']==1:
-                                                        appInfo['state']='installed'
+                                                if 'state' in n4dvars[key]:
+                                                        if n4dvars[key]['state']==1:
+                                                                appInfo['state']='installed'
                         else:
                                 self._set_status(2)
-                except:
+                except Exception as e:
                         self._set_status(10)
 #               self.result['data'].append(appInfo)

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)
+#                       result['data'].append(appInfo)
                         package_type=self._check_package_type(appInfo)
                         if package_type in typeDict:
@@ -387 +387 @@
                                 #Only search full info if it's required
                                 if (fullsearch==False and package_type=='deb'):
-#                                       result['data'].extend(typeDict[package_type])
+                                        result['data'].extend(typeDict[package_type])
                                         continue
                                 self._debug("Retrieving info for "+str(typeDict[package_type]))
                                 pkgInfoFunction=self._execute_class_method(action,package_type,launchedby)
-                                result.update(pkgInfoFunction.execute_action(action,typeDict[package_type]))
+#                               result.update(pkgInfoFunction.execute_action(action,typeDict[package_type]))
+                                result['data'].extend(pkgInfoFunction.execute_action(action,typeDict[package_type])['data'])
+                                result['status']=pkgInfoFunction.execute_action(action,typeDict[package_type])['status']
                 return(result)
         #def _get_Extended_App_Info