Changeset 3669

Timestamp:

Feb 20, 2017, 12:01:30 PM (3 years ago)

Author:

Juanma

Message:

WIP on blacklist

Location:

lliurex-store/trunk/fuentes

Files:

• lliurex-store-cli/usr/share/lliurex-store/files/blacklist.json (modified) (1 diff)
• lliurex-store-cli/usr/share/lliurex-store/lliurex-store-cli.py (modified) (3 diffs)
• python3-lliurex-store.install/usr/share/lliurexstore/plugins/loadStore.py (modified) (6 diffs)

lliurex-store/trunk/fuentes/lliurex-store-cli/usr/share/lliurex-store/files/blacklist.json

@@ +1 @@
+{
+        "server": [
+                "epoptes",
+                "lliurex-pmb",
+                "zero-lliurex-pmb-installer",
+                "zero-lliurex-pmb",
+                "opac"
+        ]
+}

lliurex-store/trunk/fuentes/lliurex-store-cli/usr/share/lliurex-store/lliurex-store-cli.py

@@ -33 +33 @@
                                                 if action=='info':
                                                         try:
-                                                                print(color.BOLD+u'Package'+': '+color.END + data['package'])
+                                                                print(color.DARKCYAN+u'Package'+': '+color.END + data['package'])
                                                                 print(u'Name'+': '+data['name'])
                                                                 print(u'Version'+': '+data['version'])
@@ -54 +54 @@
                                                 elif action=='search':
                                                         #Only print name and summary
-                                                        print(color.BOLD+data['package']+color.END+": "+data['summary'])
+                                                        print(color.DARKCYAN+data['package']+color.END+": "+data['summary'])
                                                 elif action=='list':
                                                         #Print package, summary and status
@@ -62 +62 @@
                                                                 else:
                                                                         package=data['name']
-                                                                print(color.BOLD+package+color.END+": "+data['summary']+' ('+','.join(data['categories'])+')'+' ('+data['state']+')')
+                                                                print(color.DARKCYAN+package+color.END+": "+data['summary']+' ('+','.join(data['categories'])+')'+' ('+data['state']+')')
                                                         except Exception as e:
                                                                 print('Error listing :'+str(e))

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

@@ -5 +5 @@
 from gi.repository import AppStreamGlib as appstream
 import subprocess
+import json
 
 class loadstore:
@@ -22 +23 @@
         def _debug(self,msg=''):
                 if self.dbg==1:
-                        print ('DEBUG Load: '+msg)
+                        print ('DEBUG Load: '+str(msg))
         #def _debug
 
@@ -39 +40 @@
         def get_error(self):
                 return (self.error)
+        #def get_error
 
         def _load_store(self,store):
@@ -55 +57 @@
         #def load_store
 
-        def _parse_desktop(self,store): #DEPRECATED
+        def _parse_desktop(self,store): #DEPRECATED. Loads the apps from the available desktop files 
                 desktopDir='/usr/share/applications'
                 return(store)
@@ -73 +75 @@
 
         def _sanitize_store(self,store):
-                apps_to_remove=[]
                 applist=store.get_apps()
                 for app in applist:
@@ -79 +80 @@
                                 store.remove_app(app)
                 #Check the blacklist
-#               flavour=subprocess.check_output(["lliurex-version","-f"]).rstrip()
-
+                try:
+                        flavour=subprocess.check_output(["lliurex-version","-f"]).rstrip()
+                        flavour=flavour.decode("utf-8")
+                        if os.path.isfile('/usr/share/lliurex-store/files/blacklist.json'):
+                                blFile=open('/usr/share/lliurex-store/files/blacklist.json').read()
+                                blacklist=json.loads(blFile)
+                                blApps=blacklist[flavour]
+                                for blApp in blApps:
+                                        self._debug("Blacklisted app: "+blApp)
+                                        app=store.get_app_by_pkgname(blApp)
+                                        if app:
+                                                self._debug("Removed "+str(app))
+                                                store.remove_app(app)
+                                        else:
+                                                self._debug("App "+blApp+" from blacklist not found in store")
+                        else:
+                                self._debug('No blacklist to check')
+                except subprocess.CalledProcessError as e:
+                        print(u"Running on a non Lliurex host")
+                except Exception as e:
+                        self._debug("Error processing blacklist: "+str(e))
                 return (store)
         #def _sanitize_store