From 5805db984c0b92f04bd097b00ff36b617bd15a5f Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Mon, 15 Jun 2015 14:00:31 +0200 Subject: [PATCH] Passes File Description to API when Uploading --- .../crushedpixel/replaymod/api/replay/FileUploader.java | 5 ++++- .../crushedpixel/replaymod/gui/online/GuiUploadFile.java | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/api/replay/FileUploader.java b/src/main/java/eu/crushedpixel/replaymod/api/replay/FileUploader.java index f4aaf883..66af1cf3 100755 --- a/src/main/java/eu/crushedpixel/replaymod/api/replay/FileUploader.java +++ b/src/main/java/eu/crushedpixel/replaymod/api/replay/FileUploader.java @@ -56,8 +56,11 @@ public class FileUploader { } } + if(description != null && description.length() > 0) { + postData += "&description=" + URLEncoder.encode(description, "UTF-8"); + } + postData += "&name=" + URLEncoder.encode(filename, "UTF-8"); - System.out.println(postData); String url = "http://ReplayMod.com/api/upload_file" + postData; HttpURLConnection con = (HttpURLConnection) new URL(url).openConnection(); diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiUploadFile.java b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiUploadFile.java index 1f81882c..591d7b1b 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiUploadFile.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiUploadFile.java @@ -25,6 +25,7 @@ import net.minecraft.client.settings.GameSettings; import net.minecraft.util.ResourceLocation; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.lwjgl.input.Keyboard; @@ -306,6 +307,9 @@ public class GuiUploadFile extends GuiScreen { } Category category = Category.values()[GuiUploadFile.this.category.getValue()]; + + String desc = StringUtils.join(description.getText(), '\n'); + if(hideServerIP.isChecked()) { File tmp = File.createTempFile("replay_hidden_ip", "mcpr"); File tmpMeta = File.createTempFile("metadata", "json"); @@ -320,12 +324,12 @@ public class GuiUploadFile extends GuiScreen { FileUtils.copyFile(replayFile, tmp); ReplayFileIO.addFilesToZip(tmp, toAdd); - uploader.uploadFile(GuiUploadFile.this, AuthenticationHandler.getKey(), name, tags, tmp, category, null); + uploader.uploadFile(GuiUploadFile.this, AuthenticationHandler.getKey(), name, tags, tmp, category, desc); tmpMeta.delete(); tmp.delete(); } else { - uploader.uploadFile(GuiUploadFile.this, AuthenticationHandler.getKey(), name, tags, replayFile, category, null); + uploader.uploadFile(GuiUploadFile.this, AuthenticationHandler.getKey(), name, tags, replayFile, category, desc); } ReplayMod.uploadedFileHandler.markAsUploaded(replayFile);