Changeset 3880 for lliurex-store/trunk/fuentes/python3-lliurex-store.install

Timestamp:

Mar 10, 2017, 9:48:40 AM (3 years ago)

Author:

Juanma

Message:

Beta filter of duplicated packages

Location:

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

Files:

• debManager.py (modified) (6 diffs)
• loadStore.py (modified) (2 diffs)

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

@@ -56 +56 @@
                                         if action=='remove':
                                                 self._log("Removing "+appInfo['package'])
-#                                               self._get_App_Extended_Info(appInfo,app)
-#                                               self._log("Dependencies to remove"+str(appInfo['depends']))
                                                 self._remove_App(app)
                                                 self.result['data'].append({'package':appInfo['package']})
                                         if action=='pkginfo':
-                                                self._get_App_Extended_Info(appInfo,app)
+                                                self.result['data'].append(self._get_App_Extended_Info(appInfo,app))
                                 self.progress=self.progress+(self.partialProgress/self.count)
                 self.progress=100
@@ -85 +83 @@
                 try:
                         self.installer.install_packages(True,[app.get_id(),],None,self._callback,None)
-#                       self.result['data'].append({app.get_id():u'installed'})
                         err=0
                 except Exception as e:
@@ -100 +97 @@
                 try:
                         self.installer.remove_packages(True,[app.get_id(),],True,False,None,self._callback,None)
-#                       self.result['data'].append({app.get_id():0})
                         self._set_status(0)
                 except Exception as e:
@@ -137 +133 @@
                                 break
                                 
-                self.result['data'].append(appInfo)
                 return(appInfo)
-        #def _get_App_Dependencies
+        #def _get_App_Extended_Info
 
-        def _get_App_Info(self,appInfo,app,appsCount=0):
+        def _get_App_Info(self,appInfo,app,appsCount=0): #DEPRECATED
                 try:
                         info=app.get_info()
@@ -167 +162 @@
                 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("********************")
                         applist=result.get_package_array()
                         if applist:
@@ -182 +173 @@
                 return(app)
         #def _resolve_App
-
-        

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

@@ -76 +76 @@
         def _sanitize_store(self,store):
                 applist=store.get_apps()
-                uniqlist=[]
+                uniqDict={}
                 for app in applist:
                         #Remove apps whitout pkgname
@@ -85 +85 @@
                                 self._debug("Removed addon "+str(app.get_pkgnames()))
                                 store.remove_app(app)
-                        #Remove duplicated apps (as in gnome-store)
-                        #We assume that default_source=pkgname_default, although this should not be relied upon.
-                        if app.get_pkgname_default() in uniqlist:
-                                store.remove_app(app)
-                        else:
-                                uniqlist.append(app.get_pkgname_default())
-
-                         
+                        #Remove duplicated apps 
+                        #Unlike gnome-store we'll try to compare the info of the package in order of discard only the "part-of" packages
+                        pkg=app.get_pkgname_default()
+                        if pkg in uniqDict.keys():
+                                fn=app.get_id_filename()        
+                                self._debug("Comparing "+fn+" with "+uniqDict[pkg]['fn'])
+                                if fn != uniqDict[pkg]['fn']:
+                                        if fn != pkg:
+                                                self._debug("Removed "+app.get_id())
+                                                store.remove_app(app)
+                                        else:
+                                                self._debug("Removed "+uniqDict[pkg]['app'].get_id())
+                                                store.remove_app(uniqDict[pkg]['app'])
+                                                uniqDict.update({pkg:{'fn':app.get_id_filename(),'app':app}})
+                        elif pkg:
+                                print("Adding "+pkg)
+                                uniqDict.update({pkg:{'fn':app.get_id_filename(),'app':app}})
                 #Check the blacklist
                 try: