Changeset 7079

Timestamp:

Mar 20, 2018, 1:14:34 PM (3 years ago)

Author:

Juanma

Message:

External appimages file

Location:

lliurex-store/trunk/fuentes

Files:

• install-files/usr/share/lliurex-store/files/external_appimages.json (added)
• python3-lliurex-store.install/usr/share/lliurexstore/plugins/appImageManager.py (modified) (5 diffs)

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

@@ -19 +19 @@
 class appimagemanager:
         def __init__(self):
-                self.dbg=False
+                self.dbg=True
                 self.progress=0
                 self.partial_progress=0
@@ -35 +35 @@
                 self.repos={'probono':{'url':'https://dl.bintray.com/probono/AppImages', 'url_info':'https://bintray.com/probono/AppImages/$(appname)'}}
                 #Appimges not stored in a repo must be listed here, providing the download url and the info url (if there's any)
-                self.external_appimages={'synfig64':{'url':'https://kent.dl.sourceforge.net/project/synfig/releases/1.2.1/linux/SynfigStudio-1.2.1-64bit.appimage','url_info':''},'synfig32':{'url':'https://kent.dl.sourceforge.net/project/synfig/releases/1.2.1/linux/SynfigStudio-1.2.1-32bit.appimage','url_info':''}}
+                self.external_appimages="/usr/share/lliurex-store/files/external_appimages.json"
                 self.disabled=False
                 self.count=0
@@ -47 +47 @@
         def _debug(self,msg=''):
                 if self.dbg:
-                        print ('DEBUG appimage: '+msg)
+                        print ('DEBUG appimage: %s'%msg)
         #def debug
 
@@ -233 +233 @@
                                         self._debug("appImage catalogue could not be fetched: Permission denied")
                 #Load external apps
-                for app_name,app_info in self.external_appimages.items():
+                for app_name,app_info in self._get_external_appimages().items():
                         if self._chk_bundle_dir(outdir):
                                 appimage=app_info['url'].split('/')[-1]
@@ -251 +251 @@
                 return(True)
         #def _download_bundles_catalogue
+
+        def _get_external_appimages(self):
+                external_appimages={}
+                if os.path.isfile(self.external_appimages):
+                        try:
+                                with open(self.external_appimages) as appimages:
+                                        external_appimages=json.load(appimages)
+                        except:
+                                self._debug("Can't load %s"%self.external_appimages)
+                self._debug(external_appimages)
+                return external_appimages
 
         def _chk_bundle_dir(self,outdir):