games/Factorio-FBSR
1
0
Fork 0
mirror of https://github.com/demodude4u/Factorio-FBSR.git synced 2024-11-24 08:12:21 +02:00
Code Issues Releases Activity

Resolved #5

Browse Source
This commit is contained in:
Weston Rye (Demod) 2017-06-20 11:07:29 -05:00
parent f14b33ede6
commit 0cb5639ea9
5 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FactorioBlueprintStringRenderer/config.template.json
View File

@ -1,5 +1,6 @@
{
"discord_bot_token": "",
"pastebin_developer_api_key": "",
"factorio": "C:\\Program Files (x86)\\Steam\\steamapps\\common\\Factorio",
"type_schema": "https://raw.githubusercontent.com/demodude4u/factorio-tools/master/schema.json",
"__type_schema": "https://raw.githubusercontent.com/jcranmer/factorio-tools/master/schema.json"

5
FactorioBlueprintStringRenderer/pom.xml
View File

@ -60,5 +60,10 @@
<artifactId>commons-text</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>fluent-hc</artifactId>
<version>4.5.3</version>
</dependency>
</dependencies>
</project>

1
FactorioBlueprintStringRenderer/src/com/demod/fbsr/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/MultipartUtility.java

16
FactorioBlueprintStringRenderer/src/com/demod/fbsr/WebUtils.java
View File

@ -1,5 +1,6 @@
package com.demod.fbsr;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
@ -50,6 +51,21 @@ public final class WebUtils {
return Utils.readJsonFromStream(new URL(url).openStream());
}
public static URL uploadToHostingService(String fileName, byte[] fileData) throws IOException {
try (ByteArrayInputStream bais = new ByteArrayInputStream(fileData)) {
return uploadToNyaIs(fileName, bais);
}
}
private static URL uploadToNyaIs(String fileName, InputStream inputStream) throws IOException {
// XXX You can get a copy of the MultipartUtility from
// http://www.codejava.net/java-se/networking/upload-files-by-sending-multipart-request-programmatically
MultipartUtility utility = new MultipartUtility("https://nya.is/upload", "UTF-8");
utility.addFormField("name", fileName);
utility.addFilePart("files[]", fileName, inputStream);
return new URL(new JSONObject(utility.finish().get(0)).getJSONArray("files").getJSONObject(0).getString("url"));
}
private WebUtils() {
}
}

27
FactorioBlueprintStringRenderer/src/com/demod/fbsr/app/BlueprintBotDiscordService.java
View File

@ -8,6 +8,7 @@ import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.reflect.Field;
import java.net.URL;
import java.time.Instant;
import java.util.Arrays;
import java.util.List;
@ -39,6 +40,7 @@ import com.demod.fbsr.FBSR;
import com.demod.fbsr.RenderUtils;
import com.demod.fbsr.TaskReporting;
import com.demod.fbsr.TaskReporting.Level;
import com.demod.fbsr.WebUtils;
import com.demod.fbsr.WorldMap;
import com.google.common.collect.LinkedHashMultiset;
import com.google.common.collect.Multiset;
@ -83,7 +85,7 @@ public class BlueprintBotDiscordService extends AbstractIdleService {
.complete();
return;
}
sendLuaDumpFile(event, key, lua.get(), reporting);
sendLuaDumpFile(event, "raw", key, lua.get(), reporting);
} catch (Exception e) {
reporting.addException(e);
}
@ -121,7 +123,7 @@ public class BlueprintBotDiscordService extends AbstractIdleService {
return;
}
sendLuaDumpFile(event, category + "_" + prototype.get().getName(), prototype.get().lua(), reporting);
sendLuaDumpFile(event, category, prototype.get().getName(), prototype.get().lua(), reporting);
} catch (Exception e) {
reporting.addException(e);
}
@ -197,10 +199,10 @@ public class BlueprintBotDiscordService extends AbstractIdleService {
if (!results.isEmpty()) {
try {
byte[] bytes = BlueprintStringData.extractJSON(results.get(0)).toString(2).getBytes();
if (results.size() == 1 && bytes.length < 8000000) {
Message response = event.getChannel()
.sendFile(new ByteArrayInputStream(bytes), "blueprint.json", null).complete();
reporting.addDownloadURL(response.getAttachments().get(0).getUrl());
if (results.size() == 1) {
URL url = WebUtils.uploadToHostingService("blueprint.json", bytes);
event.getChannel().sendMessage("Blueprint JSON: " + url.toString()).complete();
reporting.addDownloadURL(url.toString());
} else {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
ZipOutputStream zos = new ZipOutputStream(baos)) {
@ -276,16 +278,17 @@ public class BlueprintBotDiscordService extends AbstractIdleService {
}
}
private void sendLuaDumpFile(MessageReceivedEvent event, String name, LuaValue lua, TaskReporting reporting)
throws IOException {
private void sendLuaDumpFile(MessageReceivedEvent event, String category, String name, LuaValue lua,
TaskReporting reporting) throws IOException {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream(); PrintStream ps = new PrintStream(baos)) {
ps.println("Lua Data Dump of " + name + " for Factorio " + FBSR.getVersion());
ps.println("Lua Data Dump of " + category + " " + name + " for Factorio " + FBSR.getVersion());
ps.println();
Utils.debugPrintLua(lua, ps);
ps.flush();
Message response = event.getChannel()
.sendFile(baos.toByteArray(), name + "_dump_" + FBSR.getVersion() + ".txt", null).complete();
reporting.addDownloadURL(response.getAttachments().get(0).getUrl());
URL url = WebUtils.uploadToHostingService(category + "_" + name + "_dump_" + FBSR.getVersion() + ".txt",
baos.toByteArray());
event.getChannel().sendMessage(category + " " + name + " lua dump: " + url.toString()).complete();
reporting.addDownloadURL(url.toString());
}
}