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

Timestamp:

Apr 26, 2017, 12:15:39 PM (4 years ago)

Author:

Juanma

Message:

ShManager? minor bugfix

Location:

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

Files:

• loadStore.py (modified) (2 diffs)
• shManager.py (modified) (3 diffs)

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

@@ -60 +60 @@
         def _parse_desktop(self,store): #DEPRECATED. Loads the apps from the available desktop files 
                 desktopDir='/usr/share/applications'
-                return(store)
                 applist=[]
-                for app in store.get_apps():
-                        if os.path.isfile(desktopDir+'/'+app.get_id()):
+                for desktopFile in os.listdir(desktopDir):
+                        if desktopFile.endswith('desktop'):
+                                a=appstream.App()
                                 try:
-                                        app.parse_file(desktopDir+'/'+desktop,appstream.AppParseFlags.APPEND_DATA)
-                                        store.add_app(app)
-                                except Exception as e:
+                                        a.parse_file(desktopDir+'/'+desktopFile,16)
+                                        a.set_priority(0)
+                                        for veto in a.get_vetos():
+                                                a.remove_veto(veto)
+                                        store.add_app(a)
+                                        self._debug("Adding app from desktop "+desktopFile)
+                                except:
                                         pass
-#                               for veto in app.get_vetos():
-#                                       app.remove_veto(veto)
-#                                       store.add_app(app)
                 return(store)
         #def _parse_desktop
@@ -90 +91 @@
                                 lliurexApps.update({app.get_id_filename():app})
                         else:
-                                app.set_priority(0)
+                                app.set_priority(10)
                                 if app.get_id_filename() in lliurexApps.keys():
 #                                       app.set_merge_kind(appstream.AppMergeKind.APPEND)

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

@@ -37 +37 @@
         def execute_action(self,action,applist):
                 self.result['status']={'status':-1,'msg':''}
-#               self.result['data'].append(applist)
                 count=len(applist)
                 if (action):
@@ -93 +92 @@
                                         else:
                                                 err=cmdCmd.poll()
+                                                err=3 #Force "package not installed" error
                                 cmdResult=cmdCmd.stdout.read()
                                 cmdError=cmdCmd.stderr.read()
@@ -107 +107 @@
                         err=11
                 self._set_status(err)
-                return err
+                return appInfo
         #def install_App