Add ImportFile command

JakeJMattson · Mar 23, 2020 · 831c7ed · 831c7ed
1 parent 9f5961e
commit 831c7ed
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 23 deletions.
diff --git a/commands.md b/commands.md
@@ -41,15 +41,16 @@
 | UpdateTarget   | (Channel), Message ID             | Replace the target message embed with the loaded embed. |
 
 ## Core
-| Commands  | Arguments                | Description                                |
-| --------- | ------------------------ | ------------------------------------------ |
-| Create    | Embed Name               | Create a new embed with this name.         |
-| Delete    | (Embed)                  | Delete the embed with this name.           |
-| Duplicate | Embed Name, (Embed)      | Create a new embed from an existing embed. |
-| Export    | (Embed)                  | Export the currently loaded embed to JSON. |
-| Import    | Embed Name, JSON         | Import a JSON String as an embed.          |
-| Load      | Embed                    | Load the embed with this name into memory. |
-| Send      | (Channel), (shouldTrack) | Send the currently loaded embed.           |
+| Commands   | Arguments                | Description                                |
+| ---------- | ------------------------ | ------------------------------------------ |
+| Create     | Embed Name               | Create a new embed with this name.         |
+| Delete     | (Embed)                  | Delete the embed with this name.           |
+| Duplicate  | Embed Name, (Embed)      | Create a new embed from an existing embed. |
+| Export     | (Embed)                  | Export the currently loaded embed to JSON. |
+| Import     | Embed Name, JSON         | Import a JSON String as an embed.          |
+| ImportFile | Embed Name, JSON         |                                            |
+| Load       | Embed                    | Load the embed with this name into memory. |
+| Send       | (Channel), (shouldTrack) | Send the currently loaded embed.           |
 
 ## Edit
 | Commands       | Arguments         | Description                                         |

diff --git a/src/main/kotlin/me/jakejmattson/embedbot/commands/CoreCommands.kt b/src/main/kotlin/me/jakejmattson/embedbot/commands/CoreCommands.kt
@@ -2,7 +2,8 @@ package me.jakejmattson.embedbot.commands
 
 import com.google.gson.JsonSyntaxException
 import me.aberrantfox.kjdautils.api.annotation.CommandSet
-import me.aberrantfox.kjdautils.api.dsl.command.commands
+import me.aberrantfox.kjdautils.api.dsl.command.*
+import me.aberrantfox.kjdautils.api.dsl.embed
 import me.aberrantfox.kjdautils.internal.arguments.*
 import me.jakejmattson.embedbot.arguments.EmbedArg
 import me.jakejmattson.embedbot.dataclasses.CopyLocation
@@ -90,22 +91,19 @@ fun coreCommands(embedService: EmbedService) = commands {
         description = messages.descriptions.IMPORT
         execute(WordArg("Embed Name"), SentenceArg("JSON")) {
             val (name, json) = it.args
-            val guild = it.guild!!
-
-            if (guild.hasEmbedWithName(name))
-                return@execute it.respond(messages.errors.EMBED_ALREADY_EXISTS)
+            it.importJson(name, json, embedService)
+        }
+    }
 
-            try {
-                val embed = createEmbedFromJson(name, json)
-                val wasAdded = embedService.addEmbed(guild, embed)
+    command("ImportFile") {
+        description = ""
+        execute(WordArg("Embed Name"), FileArg("JSON")) {
+            val (name, jsonFile) = it.args
+            val json = jsonFile.readText()
 
-                if (!wasAdded)
-                    it.respond(messages.errors.EMBED_ALREADY_EXISTS)
+            it.importJson(name, json, embedService)
 
-                it.reactSuccess()
-            } catch (e: JsonSyntaxException) {
-                it.respond("Invalid JSON! ${e.message?.substringAfter("Exception: ")}")
-            }
+            jsonFile.delete()
         }
     }
 
@@ -123,4 +121,23 @@ fun coreCommands(embedService: EmbedService) = commands {
                 it.respond("```json\n$json```")
         }
     }
+}
+
+private fun CommandEvent<*>.importJson(name: String, json: String, embedService: EmbedService) {
+    val guild = guild!!
+
+    if (guild.hasEmbedWithName(name))
+        return respond(messages.errors.EMBED_ALREADY_EXISTS)
+
+    try {
+        val embed = createEmbedFromJson(name, json)
+        val wasAdded = embedService.addEmbed(guild, embed)
+
+        if (!wasAdded)
+            respond(messages.errors.EMBED_ALREADY_EXISTS)
+
+        reactSuccess()
+    } catch (e: JsonSyntaxException) {
+        respond("Invalid JSON! ${e.message?.substringAfter("Exception: ")}")
+    }
 }