Changeset 7096

Timestamp:

Mar 22, 2018, 12:14:36 PM (3 years ago)

Author:

Juanma

Message:

launch appimages and snaps from gui

Location:

lliurex-store/trunk/fuentes

Files:

• lliurex-store-gui/usr/share/lliurex-store/lliurex-store-gui/DetailsBox.py (modified) (1 diff)
• python3-lliurex-store.install/usr/share/lliurexstore/plugins/appImageManager.py (modified) (2 diffs)
• python3-lliurex-store.install/usr/share/lliurexstore/plugins/infoManager.py (modified) (1 diff)

lliurex-store/trunk/fuentes/lliurex-store-gui/usr/share/lliurex-store/lliurex-store-gui/DetailsBox.py

@@ -515 +515 @@
         
         def open_clicked(self,widget):
-                
-                desktop=self.core.main_window.current_pkg["id"]
-                if os.path.exists("/usr/share/applications/%s"%desktop):
-                        os.system("gtk-launch %s"%desktop)
+                if self.core.main_window.current_pkg["bundle"]=='snap':
+                        snap=self.core.main_window.current_pkg["name"]
+                        if os.path.exists("/snap/bin/%s"%snap):
+                                os.system("/snap/bin/%s"%snap)
+                elif self.core.main_window.current_pkg["bundle"]=='appimage':
+                        appimg=self.core.main_window.current_pkg["package"]
+                        if os.path.exists(os.getenv("HOME")+"/.lliurex-store/appimg/%s"%appimg):
+                                os.system(os.getenv("HOME")+"/.lliurex-store/appimg/%s"%appimg)
+                else:
+                        desktop=self.core.main_window.current_pkg["id"]
+                        if os.path.exists("/usr/share/applications/%s"%desktop):
+                                os.system("gtk-launch %s"%desktop)
                 
         #def open_clicked

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

@@ -333 +333 @@
                 name_splitted=app.split('-')
                 name=name_splitted[0]
-                version=name_splitted[1]
-                arch=name_splitted[2]
+                if len(name_splitted)>1:
+                        version=name_splitted[1]
+                if len(name_splitted)>2:
+                        arch=name_splitted[2]
                 filename=outdir+app.lower().replace('appimage',"appdata.xml")
                 self._debug("checking if we need to download "+filename)
@@ -352 +354 @@
                         f.write("  <id>"+app.lower()+"</id>\n")
                         f.write("  <pkgname>"+app+"</pkgname>\n")
-                        f.write("  <name>"+name+"</name>\n")
+                        if version:
+                                version='-'+version
+                        f.write("  <name>"+name+version+"</name>\n")
                         f.write("  <metadata_license>CC0-1.0</metadata_license>\n")
                         f.write("  <provides><binary>"+app+"</binary></provides>\n")

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

@@ -106 +106 @@
                                         else:
                                                 appInfo['icon']=''
-                                
+                        if appInfo['icon']==None:       
+                                appInfo['icon']=''
                         if app.get_screenshots():       
                                 thumbnails_list=[]