iicd/Inkycal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented jsonc parsing

Browse Source 
Note: jsmin installation need to be done manually via `pip3 install jsmin`
This commit is contained in:
Robert Sirre 2020-06-04 23:57:31 +02:00
parent f8a0622e86
commit 065c04243d
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
inkycal/config/settings_parser.py
View File

@ -8,6 +8,7 @@ from inkycal.config.layout import Layout
import json import json
import os import os
import logging import logging
from jsmin import jsmin
logger = logging.getLogger('settings') logger = logging.getLogger('settings')
logger.setLevel(level=logging.DEBUG) logger.setLevel(level=logging.DEBUG)
@ -37,9 +38,19 @@ class Settings:
folder = settings_file_path folder = settings_file_path
os.chdir(folder) os.chdir(folder)
with open("settings.json") as file: if os.path.exists('settings.jsonc'):
settings = json.load(file) with open("settings.jsonc") as jsonc_file:
self._settings = settings #minify in order to remove comments
minified = jsmin(jsonc_file.read())
#remove known invalid json (comma followed by closing accolades)
minified = minified.replace(",}","}")
settings = json.loads(minified)
self._settings = settings
else:
with open("settings.json") as file:
settings = json.load(file)
self._settings = settings
except FileNotFoundError: except FileNotFoundError:
print('No settings file found in specified location') print('No settings file found in specified location')