new log upload functionality to upload to liteloader.com

Mumfrey
1 parent aecc5dcf
Showing 4 changed files with 150 additions and 29 deletions
java/client/com/mumfrey/liteloader/client/gui/GuiPanelLiteLoaderLog.java
java/common/com/mumfrey/liteloader/util/log/LiteLoaderLogger.java
java/common/com/mumfrey/liteloader/util/net/LiteLoaderLogUpload.java
resources/assets/liteloader/lang/en_US.lang
@@ -3,26 +3,19 @@ package com.mumfrey.liteloader.client.gui;
 import static org.lwjgl.opengl.GL11.*;
 import java.net.URI;
-import java.text.DateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import org.lwjgl.input.Keyboard;
-
-
-
-
-
-
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.resources.I18n;
+import net.minecraft.util.Session;
+
+import org.lwjgl.input.Keyboard;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
-import com.mumfrey.liteloader.util.net.PastebinUpload;
+import com.mumfrey.liteloader.util.net.LiteLoaderLogUpload;
 /**
  *
@@ -47,9 +40,9 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
 	private GuiButton btnUpload;
-	private PastebinUpload logUpload;
+	private LiteLoaderLogUpload logUpload;
-	private String pasteBinURL;
+	private String logURL;
 	private int throb;
@@ -140,19 +133,19 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
 		if (this.logUpload != null && this.logUpload.isCompleted())
 		{
-			this.pasteBinURL = this.logUpload.getPasteUrl().trim();
+			this.logURL = this.logUpload.getLogUrl().trim();
 			this.logUpload = null;
 			int xMid = this.width / 2;
-			if (this.pasteBinURL.startsWith("http:"))
+			if (this.logURL.startsWith("http:"))
 			{
-				LiteLoaderLogger.info("Log file upload succeeded, url is %s", this.pasteBinURL);
-				int urlWidth = this.mc.fontRendererObj.getStringWidth(this.pasteBinURL);
-				this.controls.add(new GuiHoverLabel(3, xMid - (urlWidth / 2), this.height / 2, this.mc.fontRendererObj, "\247n" + this.pasteBinURL, this.parent.getBrandColour()));
+				LiteLoaderLogger.info("Log file upload succeeded, url is %s", this.logURL);
+				int urlWidth = this.mc.fontRendererObj.getStringWidth(this.logURL);
+				this.controls.add(new GuiHoverLabel(3, xMid - (urlWidth / 2), this.height / 2, this.mc.fontRendererObj, "\247n" + this.logURL, this.parent.getBrandColour()));
 			}
 			else
 			{
-				LiteLoaderLogger.info("Log file upload failed, reason is %s", this.pasteBinURL);
+				LiteLoaderLogger.info("Log file upload failed, reason is %s", this.logURL);
 			}
 			this.controls.add(new GuiButton(4, xMid - 40, this.height - BOTTOM - MARGIN - 24, 80, 20, I18n.format("gui.log.closedialog")));
@@ -161,7 +154,7 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
 		if (this.closeDialog)
 		{
 			this.closeDialog = false;
-			this.pasteBinURL = null;
+			this.logURL = null;
 			this.setSize(this.width, this.height);
 		}
 	}
@@ -188,7 +181,7 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
 		int xMid = this.width / 2;
 		int yMid = this.height / 2;
-		if (this.logUpload != null || this.pasteBinURL != null)
+		if (this.logUpload != null || this.logURL != null)
 		{
 			drawRect(MARGIN + MARGIN, TOP + MARGIN, this.width - MARGIN - MARGIN, this.height - BOTTOM - MARGIN, 0xC0000000);
@@ -199,7 +192,7 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
 			}
 			else
 			{
-				if (this.pasteBinURL.startsWith("http:"))
+				if (this.logURL.startsWith("http:"))
 				{
 					this.drawCenteredString(this.mc.fontRendererObj, I18n.format("gui.log.uploadsuccess"), xMid, yMid - 14, 0xFF55FF55);
 				}
@@ -286,9 +279,9 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
 			this.updateLog();
 		}
-		if (control.id == 3 && this.pasteBinURL != null)
+		if (control.id == 3 && this.logURL != null)
 		{
-			this.openURI(URI.create(this.pasteBinURL));
+			this.openURI(URI.create(this.logURL));
 		}
 		if (control.id == 4)
@@ -368,9 +361,9 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
 			completeLog.append(logLine).append("\r\n");
 		}
-		String pasteName = "LiteLoaderLog-" + DateFormat.getDateTimeInstance().format(new Date());
-		LiteLoaderLogger.info("Uploading log file %s to pastebin...", pasteName);
-		this.logUpload = new PastebinUpload("LiteLoader", pasteName, completeLog.toString(), PastebinUpload.UNLISTED);
+		LiteLoaderLogger.info("Uploading log file to liteloader...");
+		Session session = this.mc.getSession();
+		this.logUpload = new LiteLoaderLogUpload(session.getUsername(), session.getPlayerID(), completeLog.toString());
 		this.logUpload.start();
 	}
@@ -6,6 +6,7 @@ import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.MissingFormatArgumentException;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
@@ -130,7 +131,14 @@ public class LiteLoaderLogger extends AbstractAppender
 	private static void log(Level level, String format, Object... data)
 	{
-		LiteLoaderLogger.logger.log(level, String.format(format, data));
+		try
+		{
+			LiteLoaderLogger.logger.log(level, String.format(format, data));
+		}
+		catch (MissingFormatArgumentException ex)
+		{
+			LiteLoaderLogger.logger.log(level, format.replace('%', '@'));
+		}
 	}
 	private static void log(Level level, Throwable th, String format, Object... data)
+package com.mumfrey.liteloader.util.net;
+
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
+
+/**
+ * Upload manager for posting logs to liteloader.com
+ *
+ * @author Adam Mummery-Smith
+ */
+public class LiteLoaderLogUpload extends Thread
+{
+	private static final String POST_URL = "http://logs.liteloader.com/post";
+	
+	private static final String LITELOADER_KEY = "liteloader0cea4593b6a51e7c";
+
+	private final String encodedData;
+	
+	private volatile boolean completed;
+
+	private String response = "Unknown Error";
+	
+	public LiteLoaderLogUpload(String nick, String uuid, String content)
+	{
+		Map<String, String> data = new HashMap<String, String>();
+		
+		data.put("nick", nick);
+		data.put("uuid", uuid);
+		data.put("token", LITELOADER_KEY);
+		data.put("log", content); 
+		
+		StringBuilder sb = new StringBuilder();
+
+		try
+		{
+			String separator = "";
+			for (Entry<String, String> postValue : data.entrySet())
+			{
+				sb.append(separator).append(postValue.getKey()).append("=").append(URLEncoder.encode(postValue.getValue(), "UTF-8"));
+				separator = "&";
+			}
+		}
+		catch (UnsupportedEncodingException ex)
+		{
+			ex.printStackTrace();
+		}
+		
+		this.encodedData = sb.toString();
+	}
+	
+	public boolean isCompleted()
+	{
+		return this.completed;
+	}
+	
+	public String getLogUrl()
+	{
+		return this.response;
+	}
+	
+	@Override
+	public void run()
+	{
+		try
+		{
+			URL url = new URL(POST_URL);
+			HttpURLConnection httpClient = (HttpURLConnection)url.openConnection();
+			httpClient.setConnectTimeout(5000);
+			httpClient.setReadTimeout(10000);
+			httpClient.addRequestProperty("Content-type", "application/x-www-form-urlencoded");
+			httpClient.addRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)"); // For not fail++
+			httpClient.setRequestMethod("POST");
+			httpClient.setDoOutput(true);
+			
+			DataOutputStream outputStream = new DataOutputStream(httpClient.getOutputStream());
+			outputStream.writeBytes(this.encodedData);
+			outputStream.flush();
+			
+			InputStream httpStream = httpClient.getInputStream();
+			
+			try
+			{
+				StringBuilder readString = new StringBuilder();
+				BufferedReader reader = new BufferedReader(new InputStreamReader(httpStream));
+
+				String readLine;
+				while ((readLine = reader.readLine()) != null)
+				{
+					readString.append(readLine).append("\n");
+				}
+				
+				reader.close();
+				this.response = readString.toString();
+			}
+			catch (IOException ex) { ex.printStackTrace(); }
+			
+			httpStream.close();
+			outputStream.close();
+		}
+		catch (Exception ex)
+		{
+			this.response = ex.getMessage();
+			LiteLoaderLogger.warning("Error posting log to liteloader.com: %s: %s", ex.getClass(), ex.getMessage());
+		}
+
+		this.completed = true;
+	}
+}
 \ No newline at end of file
@@ -63,7 +63,7 @@ gui.log.button=LiteLoader Log
 gui.log.title=LiteLoader Log Viewer
 gui.log.scalecheckbox=Use native resolution
 gui.log.postlog=Upload Log
-gui.log.uploading=Uploading log to pastebin...
+gui.log.uploading=Uploading log please wait...
 gui.log.uploadfailed=Upload failed
 gui.log.uploadsuccess=Upload succeeded, log available at
 gui.log.closedialog=Close