fix #113 (hopefully)

Author: s0lst1ce

src/settings.py

@@ -79,14 +79,16 @@
 #########################################
 
 # Files
-EXT_FOLDER = "exts"
 EXTENSIONS_FILE = "enabled_exts.json"
-SLAPPING_FOLDER = "slapping"
+
+#folders
 CONFIG_FOLDER = "servers"
-TODO_FOLDER = "todo"
+SLAPPING_FOLDER = "slapping"
 TIME_FOLDER = "countdowns"
 REMINDERS_FOLDER = "remind"
 EVENT_FOLDER = "events"
+EXT_FOLDER = "exts"
+TODO_FOLDER = "todo"
 # REMINDERS_FOLDER = os.path.join(TIME_FOLDER, "users")
 # EVENT_FOLDER = os.path.join(TIME_FOLDER, "events")
 LANG_FOLDER = "lang"

src/utilities.py

@@ -239,15 +239,14 @@ def __init__(
             self.default = self.data = ConfigFile.folder_mapping[folder]
 
         # currently only supports "json" files
-        # assert fext=="json", local_logger.error(f'''Can't load file with extension: {fext}''')
-        # if the extension is correct -> appending the extension name to the filename
         self.file += "." + self.fext
         # making path
         self.path = os.path.join(self.folder, self.file)
         # self.last_m_time = os.path.getmtime(self.path)
 
     def __enter__(self):
-        self.make_file()
+        if not self.make_file():
+            return self.default
         self.read()
         return self
 
@@ -275,8 +274,20 @@ def make_file(self):
                         return False
         return True
 
+    def is_json(self, file):
+        try:
+            out = json.loads(file)
+        except:
+            return False
+        return True
+
     def save(self):
-        """makes the file from the dict"""
+        """makes the file from the dict
+        can we really do anything if it fails to write? Save the original contents are write them again?"""
+        if not self.is_json(self.data):
+            raise ValueError(f"Incorrect JSON for updated {self.file}")
+            local_logger.critical(f"Discarding changes to {self.file} because they invalidated the JSON file.")
+
         try:
             with open(self.path, "w", encoding="utf-8") as file:
                 json.dump(self.data, file)
@@ -298,6 +309,8 @@ def read(self):
             local_logger.error(f"An exception occured while reading {self.file}.")
             local_logger.exception(e)
             raise e
+            return self.default
+
 
 
 class Translator(object):