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

Timestamp:

Jun 9, 2017, 2:57:36 PM (3 years ago)

Author:

Juanma

Message:

added appImage plugin

File:

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

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

@@ -31 +31 @@
         #def register
 
-        def execute_action(self,action):
+        def execute_action(self,action,store=None,loadBundles=False):
                 self.progress=0
-                self.store=appstream.Store()
+                if store:
+                        self.store=store
+                else:
+                        self.store=appstream.Store()
                 if action=='load':
-                        self._load_store(self.store)
+                        self._load_store(self.store,loadBundles)
                 self.progress=100
                 return (self.store)
@@ -44 +47 @@
         #def get_error
 
-        def _load_store(self,store):
+        def _load_store(self,store,loadBundles=False):
                 iconPath='/usr/share/icons/hicolor/128x128'
                 flags=[appstream.StoreLoadFlags.APP_INFO_SYSTEM,appstream.StoreLoadFlags.APP_INSTALL,appstream.StoreLoadFlags.APP_INFO_USER,appstream.StoreLoadFlags.DESKTOP,appstream.StoreLoadFlags.APPDATA,appstream.StoreLoadFlags.ALLOW_VETO]
@@ -55 +58 @@
                                 pass
                 store=self._sanitize_store(store)
+                if loadBundles:
+                        store=self.load_appImg_catalog(store)
                 self.store=store
                 return(store)
         #def load_store
+
+        def load_appImg_catalog(self,store):
+                iconPath='/usr/share/icons/hicolor/128x128'
+                lliurex_dir="/home/juanma/svn/xenial/devtools/appImgdep11/dep11"
+                if os.path.exists(lliurex_dir):
+                        for lliurex in os.listdir(lliurex_dir):
+                                storePath=Gio.File.new_for_path(lliurex_dir+'/'+lliurex)
+                                self._debug("Adding file "+lliurex_dir+'/'+lliurex)
+                                try:
+                                        store.from_file(storePath,iconPath,None)
+                                except Exception as e:
+                                        self._debug("Couldn't add file "+lliurex+" to store")
+                                        self._debug("Reason: "+str(e))
+                return(store)
+
+        #def load_appImg_catalog(self)
 
         def _parse_desktop(self,store): #DEPRECATED. Loads the apps from the available desktop files 
@@ -129 +150 @@
                                                 store.remove_app(uniqDict[pkg]['app'])
                         elif pkg:
-                                self._debug("Adding "+app.get_id_filename()+" to uniq dict")
+#                               self._debug("Adding "+app.get_id_filename()+" to uniq dict")
                                 uniqDict.update({pkg:{'fn':app.get_id_filename(),'app':app}})
                 #Delete zomando-related debs
@@ -146 +167 @@
                                 if purgeApp:
                                         if not purgeApp.has_category('Zomando'):
-                                                self._debug("Removed related zomando app "+str(purgeApp.get_categories()))
+                                                self._debug("Removed related zomando app "+str(purgeApp.get_id()))
                                                 store.remove_app(purgeApp)
                 return(store)
@@ -165 +186 @@
                                 blFile=open('/usr/share/lliurex-store/files/blacklist.json').read()
                                 blacklist=json.loads(blFile)
+                                blApps=[]
                                 if flavour in blacklist:
                                         blApps=blacklist[flavour]