Fix Files

master
sky 2020-02-28 11:48:28 +08:00
parent 66ef982c63
commit 811caa43b3
2 changed files with 85 additions and 7 deletions

View File

@ -0,0 +1,82 @@
1package io.izzel.taboolib.module.db.local;
import io.izzel.taboolib.util.Files;
import org.bukkit.Bukkit;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
import java.io.File;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.logging.Level;
/**
* @Author sky
* @Since 2020-02-28 11:14
*/
public class SecuredFile extends YamlConfiguration {
@Override
public synchronized void set(String path, Object value) {
super.set(path, value);
}
@Override
public synchronized void save(File file) throws IOException {
super.save(file);
}
@Override
public synchronized void save(String file) throws IOException {
super.save(file);
}
/**
*
*
*/
@Override
public void load(File file) throws InvalidConfigurationException {
String content = Files.readFromFile(file);
try {
super.loadFromString(Files.readFromFile(file));
} catch (InvalidConfigurationException t) {
Files.copy(file, new File(file.getParent(), file.getName() + "_" + new SimpleDateFormat("yyyyMMddHHmmss").format(System.currentTimeMillis()) + ".bak"));
throw t;
}
}
/**
*
*
*/
@Override
public void loadFromString(String contents) throws InvalidConfigurationException {
try {
super.loadFromString(contents);
} catch (InvalidConfigurationException t) {
System.out.println("Source: \n" + contents);
throw t;
}
}
public static SecuredFile loadConfiguration(String contents) {
SecuredFile config = new SecuredFile();
try {
config.loadFromString(contents);
} catch (Throwable t) {
Bukkit.getLogger().log(Level.SEVERE, "Cannot load source", t);
}
return config;
}
public static SecuredFile loadConfiguration(File file) {
SecuredFile config = new SecuredFile();
try {
config.load(file);
} catch (Throwable t) {
Bukkit.getLogger().log(Level.SEVERE, "Cannot load " + file, t);
}
return config;
}
}

View File

@ -2,6 +2,7 @@ package io.izzel.taboolib.util;
import io.izzel.taboolib.TabooLib;
import io.izzel.taboolib.common.plugin.InternalPlugin;
import io.izzel.taboolib.module.db.local.SecuredFile;
import io.izzel.taboolib.module.inject.TSchedule;
import io.izzel.taboolib.util.plugin.PluginUtils;
import org.bukkit.configuration.file.FileConfiguration;
@ -342,7 +343,7 @@ public class Files {
}
public static FileConfiguration decodeYAML(String args) {
return YamlConfiguration.loadConfiguration(new StringReader(Base64Coder.decodeString(args)));
return SecuredFile.loadConfiguration(Base64Coder.decodeString(args));
}
public static FileConfiguration load(File file) {
@ -350,12 +351,7 @@ public class Files {
}
public static YamlConfiguration loadYaml(File file) {
try {
return YamlConfiguration.loadConfiguration(file);
} catch (Exception e) {
e.printStackTrace();
}
return new YamlConfiguration();
return SecuredFile.loadConfiguration(file);
}
public static String getFileHash(File file, String algorithm) {