TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-07-15 16:56:15 +00:00
Code Issues Projects Releases Wiki Activity

No more null errors from corrupt config.yml's.

Browse source
This commit is contained in:
ElgarL 2012-08-19 14:49:16 +01:00
parent 84f7859ca9
commit 979da6e713
2 changed files with 67 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
EssentialsGroupManager/src/Changelog.txt
View file

@ -193,4 +193,5 @@ v 2.0:
- Fix a cases sensitivity bug in world loading.
- Stop using the YamlConfiguration in bukkit for our config handling. We can now support periods in world names.
- Fix GlobalGroups not loading permission nodes.
- Fix an error with Logging set to 'OFF' triggering a cast exception.
- Fix an error with Logging set to 'OFF' triggering a cast exception.
- No more null errors from corrupt config.yml's.

94
EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java
View file

@ -7,6 +7,7 @@ package org.anjocaido.groupmanager;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
@ -21,10 +22,10 @@ import org.yaml.snakeyaml.reader.UnicodeReader;
*/
public class GMConfiguration {
private boolean opOverride;
private boolean toggleValidate;
private Integer saveInterval;
private Integer backupDuration;
private boolean opOverride = true;
private boolean toggleValidate = true;
private Integer saveInterval = 10;
private Integer backupDuration = 24;
private String loggerLevel = "OFF";
private Map<String, Object> mirrorsMap;
@ -35,6 +36,16 @@ public class GMConfiguration {
public GMConfiguration(GroupManager plugin) {
this.plugin = plugin;
/*
* Set defaults
*/
opOverride = true;
toggleValidate = true;
saveInterval = 10;
backupDuration = 24;
loggerLevel = "OFF";
load();
}
@ -44,14 +55,14 @@ public class GMConfiguration {
if (!plugin.getDataFolder().exists()) {
plugin.getDataFolder().mkdirs();
}
File configFile = new File(plugin.getDataFolder(), "config.yml");
if (!configFile.exists()) {
try {
Tasks.copy(plugin.getResourceAsStream("config.yml"), configFile);
} catch (IOException ex) {
GroupManager.logger.log(Level.SEVERE, null, ex);
GroupManager.logger.log(Level.SEVERE, "Error creating a new config.yml", ex);
}
}
@ -61,7 +72,7 @@ public class GMConfiguration {
FileInputStream configInputStream = new FileInputStream(configFile);
GMconfig = (Map<String, Object>) configYAML.load(new UnicodeReader(configInputStream));
configInputStream.close();
} catch (Exception ex) {
throw new IllegalArgumentException("The following file couldn't pass on Parser.\n" + configFile.getPath(), ex);
}
@ -69,28 +80,53 @@ public class GMConfiguration {
/*
* Read our config settings ands store them for reading later.
*/
Map<String, Object> config = getElement("config", getElement("settings", GMconfig));
opOverride = (Boolean) config.get("opOverrides");
toggleValidate = (Boolean) config.get("validate_toggle");
/*
* data node for save/backup timers.
*/
Map<String, Object> save = getElement("save", getElement("data", getElement("settings", GMconfig)));
saveInterval = (Integer) save.get("minutes");
backupDuration = (Integer) save.get("hours");
Object level = ((Map<String, String>) getElement("settings", GMconfig).get("logging")).get("level");
if (level instanceof String)
level = (String) level;
/*
* Store our mirrors map for parsing later.
*/
mirrorsMap = (Map<String, Object>) ((Map<String, Object>) GMconfig.get("settings")).get("mirrors");
try {
Map<String, Object> config = getElement("config", getElement("settings", GMconfig));
opOverride = (Boolean) config.get("opOverrides");
toggleValidate = (Boolean) config.get("validate_toggle");
/*
* data node for save/backup timers.
*/
try {
Map<String, Object> save = getElement("save", getElement("data", getElement("settings", GMconfig)));
try {
saveInterval = (Integer) save.get("minutes");
} catch (Exception ex) {
GroupManager.logger.log(Level.SEVERE, "Missing or corrupt 'minutes' node. Using default setting", ex);
}
try {
backupDuration = (Integer) save.get("hours");
} catch (Exception ex) {
GroupManager.logger.log(Level.SEVERE, "Missing or corrupt 'hours' node. Using default setting", ex);
}
} catch (Exception ex) {
GroupManager.logger.log(Level.SEVERE, "Missing or corrupt 'data' node. Using default settings", ex);
}
Object level = ((Map<String, String>) getElement("settings", GMconfig).get("logging")).get("level");
if (level instanceof String)
level = (String) level;
/*
* Store our mirrors map for parsing later.
*/
mirrorsMap = (Map<String, Object>) ((Map<String, Object>) GMconfig.get("settings")).get("mirrors");
} catch (Exception ex) {
/*
* Flag the error and use defaults
*/
GroupManager.logger.log(Level.SEVERE, "There are errors in your config.yml. Using default settings", ex);
mirrorsMap = new HashMap<String, Object>();
}
// Setup defaults
adjustLoggerLevel();
plugin.setValidateOnlinePlayer(isToggleValidate());