Merge pull request #255 from endlessm/icon-grid-remove-arch-blacklist

icon grid: Remove per-architecture blacklist

Author: jprvita

data/Makefile.am

@@ -6,9 +6,9 @@ settings_in_files = $(wildcard settings/icon-grid-*.json.in)
 settings_DATA = $(settings_in_files:.in=)
 dist_noinst_SCRIPTS = settings/write-grid-json.py
 
-%.json: %.json.in settings/arch-blacklist.json settings/write-grid-json.py
+%.json: %.json.in settings/write-grid-json.py
 	$(AM_V_GEN)$(srcdir)/settings/write-grid-json.py -o $@ \
-		$< $(srcdir)/settings/arch-blacklist.json $(host_cpu)
+		$<
 
 do_subst = sed \
 	-e 's|@PKG_DATA_DIR[@]|$(pkgdatadir)|g' \
@@ -21,7 +21,6 @@ eos-save-icon-grid: eos-save-icon-grid.in Makefile
 EXTRA_DIST = \
     $(folders_DATA) \
     $(settings_in_files) \
-    settings/arch-blacklist.json \
     eos-save-icon-grid.in \
     $(NULL)
 

data/settings/arch-blacklist.json

@@ -1,25 +1,17 @@
 #!/usr/bin/env python3
 
-from argparse import ArgumentParser
-from collections import OrderedDict
-import errno
+from argparse import ArgumentParser, FileType
 import json
 import os
 import sys
 
 aparser = ArgumentParser(description='Write icon grid json file')
 aparser.add_argument('-o', '--output', help='output file')
-aparser.add_argument('input', help='input template file')
-aparser.add_argument('blacklist', help='blacklist file')
-aparser.add_argument('cpu', help='CPU for blacklisting')
+aparser.add_argument('input', help='input template file', type=FileType("r"))
 args = aparser.parse_args()
 
-# Load with template and blacklist. Use OrderedDict for the grid to
-# maintain sorting of the keys.
-with open(args.input, 'r') as infile:
-    grid = json.load(infile, object_pairs_hook=OrderedDict)
-with open(args.blacklist, 'r') as blfile:
-    blacklist = json.load(blfile)
+# Load template
+grid = json.load(args.input)
 
 # Open the a temporary version of the output file if specified, ensuring
 # that leading directories are created first.
@@ -28,22 +20,9 @@
 else:
     outdir = os.path.dirname(args.output)
     if len(outdir) > 0:
-        try:
-            os.makedirs(outdir)
-        except OSError as err:
-            if err.errno != errno.EEXIST:
-                raise
+        os.makedirs(outdir, exist_ok=True)
     outfile = open(args.output + '.tmp', 'w')
 
-# Strip out blacklisted apps
-cpu_blacklist = blacklist.get(args.cpu, [])
-for app in cpu_blacklist:
-    if app in grid:
-        del grid[app]
-    for sect, apps in grid.items():
-        if app in apps:
-            grid[sect].remove(app)
-
 # Check that all directories are in the top-level "desktop" pseudo-directory
 desktop = grid["desktop"]
 for directory in grid: