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

Timestamp:

Jan 25, 2018, 4:47:53 PM (3 years ago)

Author:

Juanma

Message:

Add snap support. Improved argument pass for plugins

File:

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

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

@@ -52 +52 @@
                 if action=='load_bundles':
                         self._load_store(self.store,loadBundles=True)
-#               self.progress=100
                 self.result['data']=self.store
                 self.progress=100
                 return(self.result)
-#               return (self.store)
         #def execute_action
 
@@ -91 +89 @@
                         if target_file.endswith('appdata.xml'):
                                 store_file=Gio.File.new_for_path(target_dir+'/'+target_file)
-                                self._debug("Adding file "+target_dir+'/'+target_file)
+                                self._debug("Adding file %s/%s"%(target_dir,target_file))
                                 try:
                                         store.from_file(store_file,icon_dir,None)
                                 except Exception as e:
-                                        self._debug("Couldn't add file "+target_file+" to store")
-                                        self._debug("Reason: "+str(e))
+                                        self._debug("Couldn't add file %s to store"%target_file)
+                                        self._debug("Reason: %s"%e)
                 return(store)
         
@@ -111 +109 @@
                                                 a.remove_veto(veto)
                                         store.add_app(a)
-                                        self._debug("Adding app from desktop "+desktop_file)
+                                        self._debug("Adding app from desktop %s"%desktop_file)
                                 except:
                                         pass
@@ -125 +123 @@
                         #Zomandos get max priority
                         if app.has_category('Zomando'):
-                                self._debug("Prioritize zmd "+str(app.get_id()))
+                                self._debug("Prioritize zmd %s"%app.get_id())
                                 app.set_priority(400)
                                 lliurex_apps.update({app.get_id_filename():app})
@@ -132 +130 @@
                         #Prioritize Lliurex apps
                         elif app.has_category('Lliurex'):
-                                self._debug("Prioritize app "+str(app.get_id()))
+                                self._debug("Prioritize app %s"%app.get_id())
                                 app.set_priority(200)
                                 lliurex_apps.update({app.get_id_filename():app})
                         elif str(app.get_origin()).find('lliurex')>=0:
-                                self._debug("Prioritize app "+app.get_id())
+                                self._debug("Prioritize app %s"%app.get_id())
                                 app.set_priority(100)
                                 lliurex_apps.update({app.get_id_filename():app})
@@ -142 +140 @@
                                 app.set_priority(0)
                                 if app.get_id_filename() in lliurex_apps.keys():
-                                        self._debug("Mergin app "+str(app.get_id())+" as is in Lliurex")
+                                        self._debug("Mergin app %s as is in LliureX"%app.get_id())
                                         lliurex_apps[app.get_id_filename()].subsume_full(app,appstream.AppSubsumeFlags.BOTH_WAYS)
                                         store.remove_app(app)
@@ -150 +148 @@
                         #Remove add-on apps (as are included in the main packages)
                         if app.get_kind()==appstream.AppKind.ADDON:
-                                self._debug("Removed addon "+str(app.get_pkgnames()))
+                                self._debug("Removed addon %s"%app.get_pkgnames())
                                 store.remove_app(app)
                         #Remove duplicated apps 
@@ -157 +155 @@
                         if pkg in tmp_store_apps.keys():
                                 fn=app.get_id_no_prefix()
-                                self._debug("Comparing "+fn+" with "+tmp_store_apps[pkg]['fn'])
+                                self._debug("Comparing %s with %s"%(fn,tmp_store_apps[pkg]['fn']))
                                 if fn != tmp_store_apps[pkg]['fn']:
                                         if fn != pkg and ".desktop" not in fn:
-                                                self._debug("Removed duplicated "+app.get_id())
+                                                self._debug("Removed duplicated %s"%app.get_id())
                                                 store.remove_app(app)
                                         else:
-                                                self._debug("Removed duplicated "+tmp_store_apps[pkg]['app'].get_id())
+                                                self._debug("Removed duplicated %s"%tmp_store_apps[pkg]['app'].get_id())
                                                 store.remove_app(tmp_store_apps[pkg]['app'])
                                                 tmp_store_apps.update({pkg:{'fn':app.get_id_no_prefix(),'app':app}})
@@ -178 +176 @@
         def _purge_zomandos(self,zmd_apps,store):
                 for zmd_id in zmd_apps:
-                        self._debug("Searching debs related to "+zmd_id)
+                        self._debug("Searching debs related to %s"%zmd_id)
                         purge_list=store.get_apps_by_id(zmd_id)
                         purge_list.extend(store.get_apps_by_id(zmd_id+".desktop"))
@@ -184 +182 @@
                                 if purge_app:
                                         if not purge_app.has_category('Zomando'):
-                                                self._debug("Removed related zomando app "+str(purge_app.get_id()))
+                                                self._debug("Removed related zomando app %s"%purge_app.get_id())
                                                 store.remove_app(purge_app)
                 return(store)
@@ -222 +220 @@
                                                         store.remove_app(app)
                                                 else:
-                                                        self._debug("App "+blacklist_app+" from blacklist not found in store. Assigned to RE blacklist")
+                                                        self._debug("App %s from blacklist not found in store. Assigned to RE blacklist"%blacklist_app)
                                                         blacklist_re.append("("+blacklist_app+")")
                                 if blacklist_re:
@@ -231 +229 @@
                                                         if re_result:
                                                                 store.remove_app(app)
-                                                                self._debug("Removed "+str(app.get_id()) +" as matches with "+blacklist_app)
+                                                                self._debug("Removed %s as matches with %s"%(app.get_id(),blacklist_app))
                         else:
                                 self._debug('No blacklist to check')
                 except Exception as e:
-                        self._debug("Error processing blacklist: "+str(e))
+                        self._debug("Error processing blacklist: %s"%e)
                 finally:
                         return(store)