Merge pull request #21 from astr0n8t/v0.2.0

V0.2.0

Author: astr0n8t

bot.py

@@ -16,38 +16,82 @@ class Command:
     desc: str
     resp: str
     url: str
+    headers: str
+    data: str
+    group: str
 
-def cmd_builder(name, desc, resp, url):
+@dataclass
+class Group:
+    name: str
+    desc: str
+    parent: str
 
-    return"@bot.command(description='" + desc + """')
+def cmd_builder(name, desc, resp, url, headers, data, group):
+
+    return"@" + group + ".command(description='" + desc + """')
 async def """ + name + """(ctx):
-    req = requests.post('""" + url + """')
+    req = requests.post('""" + url + """', headers=""" + headers + """, data=""" + data + """)
     await ctx.respond(f\"""" + resp + "\")"
 
+def group_builder(name, desc, parent):
+    return name + " = " + parent + ".create_group('" + name + "', '" + desc + "')"
+
 def get_commands():
-    command_list = []
+    commands = []
     dishook_prefix = "DISHOOK_COMMAND_"
     i = 0
     while os.getenv(str(dishook_prefix + str(i))):
+        current_prefix = str(dishook_prefix + str(i))
         cmd = Command(
-            name=str(os.getenv(str(dishook_prefix + str(i)))),
-            desc=str(os.getenv(str(dishook_prefix + str(i) + "_DESCRIPTION"))),
-            resp=str(os.getenv(str(dishook_prefix + str(i) + "_RESPONSE"))),
-            url=str(os.getenv(str(dishook_prefix + str(i) + "_URL")))
+            name=str(os.getenv(current_prefix)),
+            desc=str(os.getenv(str(current_prefix + "_DESCRIPTION"))),
+            resp=str(os.getenv(str(current_prefix + "_RESPONSE"))),
+            url=str(os.getenv(str(current_prefix  + "_URL"))),
+            headers="{}",
+            data="{}",
+            group="bot"
         )
-        command_list.append(cmd) 
+        if os.getenv(str(current_prefix + "_HEADERS")):
+            cmd.headers = str(os.getenv(str(current_prefix + "_HEADERS")))
+        if os.getenv(str(current_prefix + "_DATA")):
+            cmd.headers = str(os.getenv(str(current_prefix + "_DATA")))
+        if os.getenv(str(current_prefix + "_GROUP")):
+            cmd.group = str(os.getenv(str(current_prefix + "_GROUP")))
+        commands.append(cmd) 
         i += 1
-    return command_list
+    return commands
+
+def get_groups():
+    groups = []
+    dishook_prefix = "DISHOOK_GROUP_"
+    i = 0
+    while os.getenv(str(dishook_prefix + str(i))):
+        current_prefix = str(dishook_prefix + str(i))
+        group = Group(
+            name=str(os.getenv(current_prefix)),
+            desc=str(os.getenv(str(current_prefix + "_DESCRIPTION"))),
+            parent="bot"
+        )
+        if os.getenv(str(current_prefix + "_PARENT")):
+            group.parent = str(os.getenv(str(current_prefix + "_PARENT")))
+        groups.append(group)
+        i += 1
+    return groups
 
 if __name__ == '__main__':
 
     print("Beginning to look for commands designated by DISHOOK_COMMAND_#")
 
     commands = get_commands()
+    groups = get_groups()
+
+    for group in groups:
+        print("Loading groups: '" + group.name + "' with desc: '" + group.desc + "'")
+        exec(group_builder(group.name, group.desc, group.parent))
 
     for cmd in commands:
         print("Loading command: '" + cmd.name + "' with desc: '" + cmd.desc + "'")
-        exec(cmd_builder(cmd.name, cmd.desc, cmd.resp, cmd.url))
+        exec(cmd_builder(cmd.name, cmd.desc, cmd.resp, cmd.url, cmd.headers, cmd.data))
 
     print("Success.  Starting dishook...")
     bot.run(token)