diff options
Diffstat (limited to 'lib/python/qmk')
| -rwxr-xr-x | lib/python/qmk/cli/generate/api.py | 2 | ||||
| -rw-r--r-- | lib/python/qmk/info.py | 10 | 
2 files changed, 8 insertions, 4 deletions
| diff --git a/lib/python/qmk/cli/generate/api.py b/lib/python/qmk/cli/generate/api.py index 9807a9cd68..66db37cb52 100755 --- a/lib/python/qmk/cli/generate/api.py +++ b/lib/python/qmk/cli/generate/api.py @@ -36,7 +36,7 @@ def generate_api(cli):          keyboard_readme_src = Path('keyboards') / keyboard_name / 'readme.md'          keyboard_dir.mkdir(parents=True, exist_ok=True) -        keyboard_info.write_text(json.dumps(kb_all['keyboards'][keyboard_name])) +        keyboard_info.write_text(json.dumps({'last_updated': current_datetime(), 'keyboards': {keyboard_name: kb_all['keyboards'][keyboard_name]}}))          if keyboard_readme_src.exists():              copyfile(keyboard_readme_src, keyboard_readme) diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index d73ba8cfb6..f476dc666d 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -230,11 +230,15 @@ def merge_info_jsons(keyboard, info_data):      """      for info_file in find_info_json(keyboard):          # Load and validate the JSON data -        with info_file.open('r') as info_fd: -            new_info_data = json.load(info_fd) +        try: +            with info_file.open('r') as info_fd: +                new_info_data = json.load(info_fd) +        except Exception as e: +            _log_error(info_data, "Invalid JSON in file %s: %s: %s" % (str(info_file), e.__class__.__name__, e)) +            continue          if not isinstance(new_info_data, dict): -            _log_error(info_data, "Invalid file %s, root object should be a dictionary.", str(info_file)) +            _log_error(info_data, "Invalid file %s, root object should be a dictionary." % (str(info_file),))              continue          # Copy whitelisted keys into `info_data` | 
