icon-grid: Simplify installing JSON files

.gitignore

@@ -25,7 +25,9 @@ stamp-h1
 /content/*.gresource
 /content/*.gresource.xml
 /data/eos-save-icon-grid
-/data/settings/icon-grid-*.json
+/data/test-suite.log
+/data/settings/validate-grid-json.py.log
+/data/settings/validate-grid-json.py.trs
 /debian/eos-acknowledgements
 /debian/eos-shell-content
 /debian/eos-shell-content-dev
@@ -53,4 +55,5 @@ stamp-h1
 /po/stamp-po
 /po/*.gmo
 /py-compile
+/test-driver
 /unzipped

data/Makefile.am

@@ -2,13 +2,9 @@ foldersdir = $(datadir)/desktop-directories
 folders_DATA = $(wildcard folders/*.directory)
 
 settingsdir = $(pkgdatadir)/icon-grid-defaults
-settings_in_files = $(wildcard settings/icon-grid-*.json.in)
-settings_DATA = $(settings_in_files:.in=)
-dist_noinst_SCRIPTS = settings/write-grid-json.py
+settings_DATA = $(wildcard settings/icon-grid-*.json)
 
-%.json: %.json.in settings/arch-blacklist.json settings/write-grid-json.py
-	$(AM_V_GEN)$(srcdir)/settings/write-grid-json.py -o $@ \
-		$< $(srcdir)/settings/arch-blacklist.json $(host_cpu)
+TESTS = settings/validate-grid-json.py
 
 do_subst = sed \
 	-e 's|@PKG_DATA_DIR[@]|$(pkgdatadir)|g' \
@@ -20,8 +16,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)
 
@@ -30,6 +24,5 @@ bin_SCRIPTS = \
     $(NULL)
 
 CLEANFILES = \
-    $(settings_DATA) \
     eos-save-icon-grid \
     $(NULL)

data/settings/validate-grid-json.py

@@ -0,0 +1,40 @@
+#!/usr/bin/env python3
+
+from argparse import ArgumentParser, FileType
+import json
+import os
+import sys
+import glob
+
+def check(filename):
+    print(f"Checking {filename}")
+
+    # Load template
+    with open(filename) as f:
+        grid = json.load(f)
+
+    # Check that all directories are in the top-level "desktop" pseudo-directory
+    desktop = grid["desktop"]
+    for directory in grid:
+        if directory != "desktop" and directory not in desktop:
+            raise ValueError(
+                '"{}" defined but not in "desktop" directory'.format(directory)
+            )
+
+def main():
+    aparser = ArgumentParser(description='Validate icon grid JSON files')
+    aparser.add_argument('input',
+                         help='input template file (default: all grid files in script directory)',
+                         nargs="*")
+    args = aparser.parse_args()
+
+    if not args.input:
+        args.input = glob.glob(
+            os.path.dirname(__file__) + "/icon-grid-*.json",
+        )
+
+    for filename in args.input:
+        check(filename)
+
+if __name__ == "__main__":
+    main()