initial working update

cogs/utils/checks.py

@@ -1,7 +1,8 @@
 from discord.ext import commands
 import discord.utils
-import os.path
-import json
+from cogs.utils.settings import Settings
+from cogs.utils.dataIO import fileIO
+from __main__ import settings
 
 #
 # This is a modified version of checks.py, originally made by Rapptz
@@ -10,15 +11,8 @@ import json
 #          https://github.com/Rapptz/RoboDanny/tree/async
 #
 
-try:
-    with open("data/red/settings.json", "r") as f:
-        settings = json.loads(f.read())
-except Exception as e:
-    print(e)
-    settings = {"OWNER" : False, "default":{"ADMIN_ROLE" : False, "MOD_ROLE" : False}}
-
 def is_owner_check(ctx):
-    return ctx.message.author.id == settings["OWNER"]
+    return ctx.message.author.id == settings.owner
 
 def is_owner():
     return commands.check(is_owner_check)
@@ -33,17 +27,6 @@ def is_owner():
 # the permissions required for them.
 # Of course, the owner will always be able to execute commands.
 
-def save_bot_settings(bot_settings=settings):
-    with open("data/red/settings.json", "w") as f:
-        f.write(json.dumps(bot_settings,sort_keys=True,indent=4,separators=(',',':')))
-
-def update_old_settings():
-    mod = settings["MOD_ROLE"]
-    admin = settings["ADMIN_ROLE"]
-    del settings["MOD_ROLE"]
-    del settings["ADMIN_ROLE"]
-    settings["default"] = {"MOD_ROLE":mod,"ADMIN_ROLE":admin}
-
 def check_permissions(ctx, perms):
     if is_owner_check(ctx):
         return True
@@ -67,30 +50,17 @@ def role_or_permissions(ctx, check, **perms):
 
 def mod_or_permissions(**perms):
     def predicate(ctx):
-        if "default" not in settings:
-            update_old_settings()
-        if admin_or_permissions(**perms):
-            return True
-        sid = ctx.message.server.id
-        if sid not in settings:
-            mod_role = settings["default"]["MOD_ROLE"].lower()
-            admin_role = settings["default"]["ADMIN_ROLE"].lower()
-        else:
-            mod_role = settings[sid]["MOD_ROLE"].lower()
-            admin_role = settings[sid]["ADMIN_ROLE"].lower()
+        server = ctx.message.server
+        mod_role = settings.get_server_mod(server)
+        admin_role = settings.get_server_admin(server)
         return role_or_permissions(ctx, lambda r: r.name.lower() in (mod_role,admin_role), **perms)
 
     return commands.check(predicate)
 
 def admin_or_permissions(**perms):
     def predicate(ctx):
-        if "default" not in settings:
-            update_old_settings()
-        sid = ctx.message.server.id
-        if sid not in settings:
-            admin_role = settings["default"]["ADMIN_ROLE"]
-        else:
-            admin_role = settings[sid]["ADMIN_ROLE"]
+        server = ctx.message.server
+        admin_role = settings.get_server_admin(server)
         return role_or_permissions(ctx, lambda r: r.name.lower() == admin_role.lower(), **perms)
 
     return commands.check(predicate)

cogs/utils/dataIO.py

@@ -3,7 +3,7 @@ import json
 def fileIO(filename, IO, data=None):
     if IO == "save" and data != None:
         with open(filename, encoding='utf-8', mode="w") as f:
-            f.write(json.dumps(data))
+            f.write(json.dumps(data,indent=4,sort_keys=True,separators=(',',' : ')))
     elif IO == "load" and data == None:
         with open(filename, encoding='utf-8', mode="r") as f:
             return json.loads(f.read())

cogs/utils/settings.py

@@ -0,0 +1,125 @@
+from .dataIO import fileIO
+import discord
+
+default_path = "data/red/settings.json"
+
+class Settings:
+    def __init__(self,path=default_path):
+        self.path = path
+        self.default_settings = {"EMAIL" : "EmailHere", "PASSWORD" : "PasswordHere", "OWNER" : "id_here", "PREFIXES" : [], "default":{"ADMIN_ROLE" : "Transistor", "MOD_ROLE" : "Process"}}
+        if not fileIO(self.path,"check"):
+            self.bot_settings = self.default_settings
+            self.save_settings()
+        else:
+            self.bot_settings = fileIO(self.path,"load")
+        if "default" not in self.bot_settings:
+            self.update_old_settings()
+
+    def save_settings(self):
+        fileIO(self.path,"save",self.bot_settings)
+
+    def update_old_settings(self):
+        mod = self.bot_settings["MOD_ROLE"]
+        admin = self.bot_settings["ADMIN_ROLE"]
+        del self.bot_settings["MOD_ROLE"]
+        del self.bot_settings["ADMIN_ROLE"]
+        self.bot_settings["default"] = {"MOD_ROLE":mod,"ADMIN_ROLE":admin}
+        self.save_settings()
+
+    @property
+    def owner(self):
+        return self.bot_settings["OWNER"]
+
+    @owner.setter
+    def owner(self,value):
+        self.bot_settings["OWNER"] = value
+        self.save_settings()
+
+    @property
+    def email(self):
+        return self.bot_settings["EMAIL"]
+
+    @property
+    def password(self):
+        return self.bot_settings["PASSWORD"]
+
+    @property
+    def prefixes(self):
+        return self.bot_settings["PREFIXES"]
+
+    @prefixes.setter
+    def prefixes(self,value):
+        self.bot_settings["PREFIXES"] = value
+        self.save_settings()
+
+    @property
+    def default_admin(self):
+        if "default" not in self.bot_settings:
+            self.update_old_settings()
+        return self.bot_settings["default"].get("ADMIN_ROLE","")
+
+    @default_admin.setter
+    def default_admin(self,value):
+        if "default" not in self.bot_settings:
+            self.update_old_settings()
+        self.bot_settings["default"]["ADMIN_ROLE"] = value
+        self.save_settings()
+
+    @property
+    def default_mod(self):
+        if "default" not in self.bot_settings:
+            self.update_old_settings()
+        return self.bot_settings["default"].get("MOD_ROLE","")
+
+    @default_mod.setter
+    def default_mod(self,value):
+        if "default" not in self.bot_settings:
+            self.update_old_settings()
+        self.bot_settings["default"]["MOD_ROLE"] = value
+        self.save_settings()
+
+    @property
+    def servers(self):
+        ret = {}
+        server_ids = list(filter(lambda x: str(x).isdigit(),self.bot_settings))
+        for server in server_ids:
+            ret.update({server:self.bot_settings[server]})
+        return ret
+
+    def get_server_admin(self,server):
+        assert isinstance(server,discord.Server)
+        if server is None:
+            return
+        if server.id not in self.bot_settings:
+            return self.default_admin
+        return self.bot_settings[server.id].get("ADMIN_ROLE","")
+
+    def set_server_admin(self,server,value):
+        assert isinstance(server,discord.Server)
+        if server is None:
+            return
+        if server.id not in self.bot_settings:
+            self.add_server(server.id)
+        self.bot_settings[server.id]["ADMIN_ROLE"] = value
+        self.save_settings()
+
+    def get_server_mod(self,server):
+        assert isinstance(server,discord.Server)
+        if server is None:
+            return
+        if server.id not in self.bot_settings:
+            return self.default_mod
+        return self.bot_settings[server.id].get("MOD_ROLE","")
+
+    def set_server_mod(self,server,value):
+        assert isinstance(server,discord.Server)
+        if server is None:
+            return
+        if server.id not in self.bot_settings:
+            self.add_server(server.id)
+        self.bot_settings[server.id]["MOD_ROLE"] = value
+        self.save_settings()
+
+    def add_server(self,sid):
+        self.bot_settings[sid] = self.bot_settings["default"].copy()
+        self.save_settings()