mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-02-05 16:30:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adds splitting of the dump log because of the Hastebin max character length

Browse Source
This commit is contained in:
Fuzzlemann 2017-08-11 17:54:43 +02:00
parent 40230100bf
commit bb573d0b2b
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpLog.java
View File

@ -1,6 +1,9 @@
package main.java.com.djrapitops.plan.utilities.file.dump; package main.java.com.djrapitops.plan.utilities.file.dump;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import main.java.com.djrapitops.plan.Log; import main.java.com.djrapitops.plan.Log;
import org.bukkit.Bukkit;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser; import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException; import org.json.simple.parser.ParseException;
@ -21,7 +24,7 @@ import java.util.List;
*/ */
public class DumpLog { public class DumpLog {
private List<CharSequence> lines = new ArrayList<>(); private final List<CharSequence> lines = new ArrayList<>();
/** /**
* Writes a header * Writes a header
@ -102,7 +105,31 @@ public class DumpLog {
* @return The link to the Dump Log * @return The link to the Dump Log
*/ */
String upload() { String upload() {
String content = this.toString(); List<String> parts = ImmutableList.copyOf(split()).reverse();
Bukkit.broadcast(parts.size() + "", "asdasd");
String lastLink = null;
for (String part : parts) {
if (lastLink != null) {
part += "\n" + lastLink;
Bukkit.broadcast("link not null " + lastLink, "asdasd");
}
lastLink = upload(part);
Bukkit.broadcast(lastLink, "asdasd");
}
return lastLink;
}
/**
* Uploads the content to Hastebin using HTTPS and POST
*
* @param content The content
* @return The link to the content
*/
private String upload(String content) {
HttpsURLConnection connection = null; HttpsURLConnection connection = null;
try { try {
URL url = new URL("https://hastebin.com/documents"); URL url = new URL("https://hastebin.com/documents");
@ -116,13 +143,16 @@ public class DumpLog {
connection.setDoOutput(true); connection.setDoOutput(true);
DataOutputStream wr = new DataOutputStream(connection.getOutputStream()); DataOutputStream wr = new DataOutputStream(connection.getOutputStream());
wr.writeBytes(this.toString()); wr.writeBytes(content);
wr.flush(); wr.flush();
wr.close(); wr.close();
BufferedReader rd = new BufferedReader(new InputStreamReader(connection.getInputStream())); BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
String response = reader.readLine();
JSONParser parser = new JSONParser(); JSONParser parser = new JSONParser();
JSONObject json = (JSONObject) parser.parse(rd.readLine()); JSONObject json = (JSONObject) parser.parse(response);
return "https://hastebin.com/" + json.get("key"); return "https://hastebin.com/" + json.get("key");
} catch (IOException | ParseException e) { } catch (IOException | ParseException e) {
@ -135,6 +165,10 @@ public class DumpLog {
} }
} }
private Iterable<String> split() {
return Splitter.fixedLength(390000).split(this.toString());
}
@Override @Override
public String toString() { public String toString() {
return String.join("\n", lines); return String.join("\n", lines);

2
Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpUtils.java
View File

@ -247,7 +247,7 @@ public class DumpUtils {
* @throws IOException when an error while reading occurred * @throws IOException when an error while reading occurred
*/ */
private static void addErrorLog(DumpLog log, Plan plan) throws IOException { private static void addErrorLog(DumpLog log, Plan plan) throws IOException {
Path errorFile = FileSystems.getDefault().getPath(plan.getDataFolder().getAbsolutePath(), Log.getErrorsFilename()); Path errorFile = FileSystems.getDefault().getPath(plan.getDataFolder().getAbsolutePath(), "Errors.txt");
if (Files.notExists(errorFile)) { if (Files.notExists(errorFile)) {
return; return;