Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2025-01-08 09:17:38 +01:00
Code Issues Projects Releases Wiki Activity

make it easier to upload files with the version event

Browse Source
This commit is contained in:
Kermina Awad 2020-10-06 00:47:33 -04:00
parent 36094e2bea
commit 994bf922af
2 changed files with 121 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java
View File

@ -55,96 +55,74 @@ public class VersionCommand extends MultiverseCommand {
} }
private String getLegacyString() { private String getLegacyString() {
return "[Multiverse-Core] Multiverse-Core Version: " + this.plugin.getDescription().getVersion() + System.lineSeparator() + return "[Multiverse-Core] Multiverse-Core Version: " + this.plugin.getDescription().getVersion() + System.lineSeparator()
"[Multiverse-Core] Bukkit Version: " + this.plugin.getServer().getVersion() + System.lineSeparator() + + "[Multiverse-Core] Bukkit Version: " + this.plugin.getServer().getVersion() + System.lineSeparator()
"[Multiverse-Core] Loaded Worlds: " + this.plugin.getMVWorldManager().getMVWorlds() + System.lineSeparator() + + "[Multiverse-Core] Loaded Worlds: " + this.plugin.getMVWorldManager().getMVWorlds() + System.lineSeparator()
"[Multiverse-Core] Multiverse Plugins Loaded: " + this.plugin.getPluginCount() + System.lineSeparator() + + "[Multiverse-Core] Multiverse Plugins Loaded: " + this.plugin.getPluginCount() + System.lineSeparator()
"[Multiverse-Core] Economy being used: " + plugin.getEconomist().getEconomyName() + System.lineSeparator() + +"[Multiverse-Core] Economy being used: " + plugin.getEconomist().getEconomyName() + System.lineSeparator()
"[Multiverse-Core] Permissions Plugin: " + this.plugin.getMVPerms().getType() + System.lineSeparator() + + "[Multiverse-Core] Permissions Plugin: " + this.plugin.getMVPerms().getType() + System.lineSeparator()
"[Multiverse-Core] Dumping Config Values: (version " + this.plugin.getMVConfig().getVersion() + ")" + System.lineSeparator() + + "[Multiverse-Core] Dumping Config Values: (version " + this.plugin.getMVConfig().getVersion() + ")" + System.lineSeparator()
"[Multiverse-Core] enforceaccess: " + plugin.getMVConfig().getEnforceAccess() + System.lineSeparator() + + "[Multiverse-Core] enforceaccess: " + plugin.getMVConfig().getEnforceAccess() + System.lineSeparator()
"[Multiverse-Core] prefixchat: " + plugin.getMVConfig().getPrefixChat() + System.lineSeparator() + + "[Multiverse-Core] prefixchat: " + plugin.getMVConfig().getPrefixChat() + System.lineSeparator()
"[Multiverse-Core] prefixchatformat: " + plugin.getMVConfig().getPrefixChatFormat() + System.lineSeparator() + + "[Multiverse-Core] prefixchatformat: " + plugin.getMVConfig().getPrefixChatFormat() + System.lineSeparator()
"[Multiverse-Core] useasyncchat: " + plugin.getMVConfig().getUseAsyncChat() + System.lineSeparator() + + "[Multiverse-Core] useasyncchat: " + plugin.getMVConfig().getUseAsyncChat() + System.lineSeparator()
"[Multiverse-Core] teleportintercept: " + plugin.getMVConfig().getTeleportIntercept() + System.lineSeparator() + + "[Multiverse-Core] teleportintercept: " + plugin.getMVConfig().getTeleportIntercept() + System.lineSeparator()
"[Multiverse-Core] firstspawnoverride: " + plugin.getMVConfig().getFirstSpawnOverride() + System.lineSeparator() + + "[Multiverse-Core] firstspawnoverride: " + plugin.getMVConfig().getFirstSpawnOverride() + System.lineSeparator()
"[Multiverse-Core] displaypermerrors: " + plugin.getMVConfig().getDisplayPermErrors() + System.lineSeparator() + + "[Multiverse-Core] displaypermerrors: " + plugin.getMVConfig().getDisplayPermErrors() + System.lineSeparator()
"[Multiverse-Core] globaldebug: " + plugin.getMVConfig().getGlobalDebug() + System.lineSeparator() + + "[Multiverse-Core] globaldebug: " + plugin.getMVConfig().getGlobalDebug() + System.lineSeparator()
"[Multiverse-Core] silentstart: " + plugin.getMVConfig().getSilentStart() + System.lineSeparator() + + "[Multiverse-Core] silentstart: " + plugin.getMVConfig().getSilentStart() + System.lineSeparator()
"[Multiverse-Core] messagecooldown: " + plugin.getMessaging().getCooldown() + System.lineSeparator() + + "[Multiverse-Core] messagecooldown: " + plugin.getMessaging().getCooldown() + System.lineSeparator()
"[Multiverse-Core] version: " + plugin.getMVConfig().getVersion() + System.lineSeparator() + + "[Multiverse-Core] version: " + plugin.getMVConfig().getVersion() + System.lineSeparator()
"[Multiverse-Core] firstspawnworld: " + plugin.getMVConfig().getFirstSpawnWorld() + System.lineSeparator() + + "[Multiverse-Core] firstspawnworld: " + plugin.getMVConfig().getFirstSpawnWorld() + System.lineSeparator()
"[Multiverse-Core] teleportcooldown: " + plugin.getMVConfig().getTeleportCooldown() + System.lineSeparator() + + "[Multiverse-Core] teleportcooldown: " + plugin.getMVConfig().getTeleportCooldown() + System.lineSeparator()
"[Multiverse-Core] defaultportalsearch: " + plugin.getMVConfig().isUsingDefaultPortalSearch() + System.lineSeparator() + + "[Multiverse-Core] defaultportalsearch: " + plugin.getMVConfig().isUsingDefaultPortalSearch() + System.lineSeparator()
"[Multiverse-Core] portalsearchradius: " + plugin.getMVConfig().getPortalSearchRadius() + System.lineSeparator() + + "[Multiverse-Core] portalsearchradius: " + plugin.getMVConfig().getPortalSearchRadius() + System.lineSeparator()
"[Multiverse-Core] autopurge: " + plugin.getMVConfig().isAutoPurgeEnabled() + System.lineSeparator() + + "[Multiverse-Core] autopurge: " + plugin.getMVConfig().isAutoPurgeEnabled() + System.lineSeparator()
"[Multiverse-Core] Special Code: FRN002" + System.lineSeparator(); + "[Multiverse-Core] Special Code: FRN002" + System.lineSeparator();
} }
private String getMarkdownString() { private String getMarkdownString() {
return "# Multiverse-Core" + System.lineSeparator() + return "# Multiverse-Core" + System.lineSeparator()
"## Overview" + System.lineSeparator() + + "## Overview" + System.lineSeparator()
"| Name | Value |" + System.lineSeparator() + + "| Name | Value |" + System.lineSeparator()
"| --- | --- |" + System.lineSeparator() + + "| --- | --- |" + System.lineSeparator()
"| Multiverse-Core Version | `" + this.plugin.getDescription().getVersion() + "` |" + System.lineSeparator() + + "| Multiverse-Core Version | `" + this.plugin.getDescription().getVersion() + "` |" + System.lineSeparator()
"| Bukkit Version | `" + this.plugin.getServer().getVersion() + "` |" + System.lineSeparator() + + "| Bukkit Version | `" + this.plugin.getServer().getVersion() + "` |" + System.lineSeparator()
"| Loaded Worlds | `" + this.plugin.getMVWorldManager().getMVWorlds() + "` |" + System.lineSeparator() + + "| Loaded Worlds | `" + this.plugin.getMVWorldManager().getMVWorlds() + "` |" + System.lineSeparator()
"| Multiverse Plugins Loaded | `" + this.plugin.getPluginCount() + "` |" + System.lineSeparator() + + "| Multiverse Plugins Loaded | `" + this.plugin.getPluginCount() + "` |" + System.lineSeparator()
"| Economy being used | `" + plugin.getEconomist().getEconomyName() + "` |" + System.lineSeparator() + + "| Economy being used | `" + plugin.getEconomist().getEconomyName() + "` |" + System.lineSeparator()
"| Permissions Plugin | `" + this.plugin.getMVPerms().getType() + "` |" + System.lineSeparator() + + "| Permissions Plugin | `" + this.plugin.getMVPerms().getType() + "` |" + System.lineSeparator()
"## Parsed Config" + System.lineSeparator() + + "## Parsed Config" + System.lineSeparator()
"These are what Multiverse thought the in-memory values of the config were." + System.lineSeparator() + System.lineSeparator() + + "These are what Multiverse thought the in-memory values of the config were." + System.lineSeparator() + System.lineSeparator()
"| Config Key | Value |" + System.lineSeparator() + + "| Config Key | Value |" + System.lineSeparator()
"| --- | --- |" + System.lineSeparator() + + "| --- | --- |" + System.lineSeparator()
"| version | `" + this.plugin.getMVConfig().getVersion() + "` |" + System.lineSeparator() + + "| version | `" + this.plugin.getMVConfig().getVersion() + "` |" + System.lineSeparator()
"| messagecooldown | `" + plugin.getMessaging().getCooldown() + "` |" + System.lineSeparator() + + "| messagecooldown | `" + plugin.getMessaging().getCooldown() + "` |" + System.lineSeparator()
"| teleportcooldown | `" + plugin.getMVConfig().getTeleportCooldown() + "` |" + System.lineSeparator() + + "| teleportcooldown | `" + plugin.getMVConfig().getTeleportCooldown() + "` |" + System.lineSeparator()
"| worldnameprefix | `" + plugin.getMVConfig().getPrefixChat() + "` |" + System.lineSeparator() + + "| worldnameprefix | `" + plugin.getMVConfig().getPrefixChat() + "` |" + System.lineSeparator()
"| worldnameprefixFormat | `" + plugin.getMVConfig().getPrefixChatFormat() + "` |" + System.lineSeparator() + + "| worldnameprefixFormat | `" + plugin.getMVConfig().getPrefixChatFormat() + "` |" + System.lineSeparator()
"| enforceaccess | `" + plugin.getMVConfig().getEnforceAccess() + "` |" + System.lineSeparator() + + "| enforceaccess | `" + plugin.getMVConfig().getEnforceAccess() + "` |" + System.lineSeparator()
"| displaypermerrors | `" + plugin.getMVConfig().getDisplayPermErrors() + "` |" + System.lineSeparator() + + "| displaypermerrors | `" + plugin.getMVConfig().getDisplayPermErrors() + "` |" + System.lineSeparator()
"| teleportintercept | `" + plugin.getMVConfig().getTeleportIntercept() + "` |" + System.lineSeparator() + + "| teleportintercept | `" + plugin.getMVConfig().getTeleportIntercept() + "` |" + System.lineSeparator()
"| firstspawnoverride | `" + plugin.getMVConfig().getFirstSpawnOverride() + "` |" + System.lineSeparator() + + "| firstspawnoverride | `" + plugin.getMVConfig().getFirstSpawnOverride() + "` |" + System.lineSeparator()
"| firstspawnworld | `" + plugin.getMVConfig().getFirstSpawnWorld() + "` |" + System.lineSeparator() + + "| firstspawnworld | `" + plugin.getMVConfig().getFirstSpawnWorld() + "` |" + System.lineSeparator()
"| debug | `" + plugin.getMVConfig().getGlobalDebug() + "` |" + System.lineSeparator(); + "| debug | `" + plugin.getMVConfig().getGlobalDebug() + "` |" + System.lineSeparator();
} }
private String readFile(final String filename) { private void addVersionInfoToEvent(MVVersionEvent event) {
StringBuilder result; // add the legacy version info
try { event.appendVersionInfo(this.getLegacyString());
FileReader reader = new FileReader(filename);
BufferedReader bufferedReader = new BufferedReader(reader);
String line;
result = new StringBuilder();
while ((line = bufferedReader.readLine()) != null) {
result.append(line).append("\n");
}
} catch (FileNotFoundException e) {
Logging.severe("Unable to find %s. Here's the traceback: %s", filename, e.getMessage());
e.printStackTrace();
result = new StringBuilder(String.format("ERROR: Could not load: %s", filename));
} catch (IOException e) {
Logging.severe("Something bad happend when reading %s. Here's the traceback: %s", filename, e.getMessage());
e.printStackTrace();
result = new StringBuilder(String.format("ERROR: Could not load: %s", filename));
}
return result.toString();
}
private Map<String, String> getVersionFiles() { // add the legacy file, but as markdown so it's readable
Map<String, String> files = new HashMap<String, String>(); event.putDetailedVersionInfo("version.md", this.getMarkdownString());
// Add the legacy file, but as markdown so it's readable // add config.yml
files.put("version.md", this.getMarkdownString());
// Add the config.yml
File configFile = new File(this.plugin.getDataFolder(), "config.yml"); File configFile = new File(this.plugin.getDataFolder(), "config.yml");
files.put(configFile.getName(), this.readFile(configFile.getAbsolutePath())); event.putDetailedVersionInfo("version.md", configFile);
// Add the worlds.yml // add worlds.yml
File worldConfig = new File(this.plugin.getDataFolder(), "worlds.yml"); File worldsFile = new File(this.plugin.getDataFolder(), "worlds.yml");
files.put(worldConfig.getName(), this.readFile(worldConfig.getAbsolutePath())); event.putDetailedVersionInfo("version.md", worldsFile);
return files;
} }
@Override @Override
@ -154,21 +132,21 @@ public class VersionCommand extends MultiverseCommand {
sender.sendMessage("Version info dumped to console. Please check your server logs."); sender.sendMessage("Version info dumped to console. Please check your server logs.");
} }
MVVersionEvent versionEvent = new MVVersionEvent(this.getLegacyString(), this.getVersionFiles()); MVVersionEvent versionEvent = new MVVersionEvent();
this.addVersionInfoToEvent(versionEvent);
this.plugin.getServer().getPluginManager().callEvent(versionEvent); this.plugin.getServer().getPluginManager().callEvent(versionEvent);
String versionInfo = versionEvent.getVersionInfo();
Map<String, String> files = versionEvent.getDetailedVersionInfo();
if (CommandHandler.hasFlag("--include-plugin-list", args)) { if (CommandHandler.hasFlag("--include-plugin-list", args)) {
versionInfo = versionInfo + System.lineSeparator() + "Plugins: " + getPluginList(); versionEvent.appendVersionInfo(System.lineSeparator() + "Plugins: " + getPluginList());
files.put("plugins.txt", "Plugins: " + getPluginList()); versionEvent.putDetailedVersionInfo("plugins.txt", "Plugins: " + getPluginList());
} }
final String data = versionInfo; final String versionInfo = versionEvent.getVersionInfo();
final Map<String, String> files = versionEvent.getDetailedVersionInfo();
// log to console // log to console
String[] lines = data.split(System.lineSeparator()); String[] lines = versionInfo.split(System.lineSeparator());
for (String line : lines) { for (String line : lines) {
if (!line.isEmpty()) { if (!line.isEmpty()) {
Logging.info(line); Logging.info(line);
@ -182,16 +160,16 @@ public class VersionCommand extends MultiverseCommand {
String pasteUrl; String pasteUrl;
if (CommandHandler.hasFlag("-b", args)) { if (CommandHandler.hasFlag("-b", args)) {
// private post to pastebin // private post to pastebin
pasteUrl = postToService(PasteServiceType.PASTEBIN, true, data, files); pasteUrl = postToService(PasteServiceType.PASTEBIN, true, versionInfo, files);
} else if (CommandHandler.hasFlag("-g", args)) { } else if (CommandHandler.hasFlag("-g", args)) {
// private post to github // private post to github
pasteUrl = postToService(PasteServiceType.GITHUB, true, data, files); pasteUrl = postToService(PasteServiceType.GITHUB, true, versionInfo, files);
} else if (CommandHandler.hasFlag("-h", args)) { } else if (CommandHandler.hasFlag("-h", args)) {
// private post to hastebin // private post to hastebin
pasteUrl = postToService(PasteServiceType.HASTEBIN, true, data, files); pasteUrl = postToService(PasteServiceType.HASTEBIN, true, versionInfo, files);
} else if (CommandHandler.hasFlag("-p", args)) { } else if (CommandHandler.hasFlag("-p", args)) {
// private post to paste.gg // private post to paste.gg
pasteUrl = postToService(PasteServiceType.PASTEGG, true, data, files); pasteUrl = postToService(PasteServiceType.PASTEGG, true, versionInfo, files);
} else { } else {
return; return;
} }

59
src/main/java/com/onarandombox/MultiverseCore/event/MVVersionEvent.java
View File

@ -1,8 +1,16 @@
package com.onarandombox.MultiverseCore.event; package com.onarandombox.MultiverseCore.event;
import com.dumptruckman.minecraft.util.Logging;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
@ -13,9 +21,9 @@ public class MVVersionEvent extends Event {
private final StringBuilder versionInfoBuilder; private final StringBuilder versionInfoBuilder;
private final Map<String, String> detailedVersionInfo; private final Map<String, String> detailedVersionInfo;
public MVVersionEvent(String legacyVersionInfo, Map<String, String> files) { public MVVersionEvent() {
this.versionInfoBuilder = new StringBuilder(legacyVersionInfo); versionInfoBuilder = new StringBuilder();
this.detailedVersionInfo = files; detailedVersionInfo = new HashMap<>();
} }
private static final HandlerList HANDLERS = new HandlerList(); private static final HandlerList HANDLERS = new HandlerList();
@ -49,14 +57,14 @@ public class MVVersionEvent extends Event {
* *
* This information is used for advanced paste services that would prefer * This information is used for advanced paste services that would prefer
* to get the information as several files. Examples include config.yml or * to get the information as several files. Examples include config.yml or
* portals.yml. * portals.yml. Note that the map returned is immutable.
* *
* The keys are filenames, the values are the contents of the files. * The keys are filenames, the values are the contents of the files.
* *
* @return The key value mapping of files and the contents of those files. * @return The immutable key value mapping of files and the contents of those files.
*/ */
public Map<String, String> getDetailedVersionInfo() { public Map<String, String> getDetailedVersionInfo() {
return this.detailedVersionInfo; return Collections.unmodifiableMap(this.detailedVersionInfo);
} }
/** /**
@ -67,12 +75,45 @@ public class MVVersionEvent extends Event {
this.versionInfoBuilder.append(moreVersionInfo); this.versionInfoBuilder.append(moreVersionInfo);
} }
private String readFile(final String filename) {
StringBuilder result;
try {
FileReader reader = new FileReader(filename);
BufferedReader bufferedReader = new BufferedReader(reader);
String line;
result = new StringBuilder();
while ((line = bufferedReader.readLine()) != null) {
result.append(line).append("\n");
}
} catch (FileNotFoundException e) {
Logging.severe("Unable to find %s. Here's the traceback: %s", filename, e.getMessage());
e.printStackTrace();
result = new StringBuilder(String.format("ERROR: Could not load: %s", filename));
} catch (IOException e) {
Logging.severe("Something bad happend when reading %s. Here's the traceback: %s", filename, e.getMessage());
e.printStackTrace();
result = new StringBuilder(String.format("ERROR: Could not load: %s", filename));
}
return result.toString();
}
/**
* Adds a file to to the detailed version-info currently saved in this event.
* @param fileName The name of the file.
* @param contents The contents of the file.
*/
public void putDetailedVersionInfo(String fileName, String contents) {
this.detailedVersionInfo.put(fileName, contents);
}
/** /**
* Adds a file to to the detailed version-info currently saved in this event. * Adds a file to to the detailed version-info currently saved in this event.
* @param filename The name of the file. * @param filename The name of the file.
* @param text The file's content. * @param file The file.
*/ */
public void putDetailedVersionInfo(String filename, String text) { public void putDetailedVersionInfo(String filename, File file) {
this.detailedVersionInfo.put(filename, text); this.putDetailedVersionInfo(filename, readFile(file.getAbsolutePath()));
} }
} }