dugulp
/
textile_backup_chinese
mirror of https://github.com/dugulingping/textile_backup_chinese.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added config check

2.x-1.16
szymon 2020-07-14 14:42:46 +02:00
parent d13bc5256c
commit 888d56c3bb
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/net/szum123321/textile_backup/ConfigHandler.java
View File

@ -87,10 +87,24 @@ public class ConfigHandler {
public Set<String> playerBlacklist = new HashSet<>();
@Comment("\nFormat of date&time used to name backup files.\n" +
"Remember not to use '#' symbol and any other character that is not allowed by your operating system such as:\n" +
"':', '\\', etc\n")
"Remember not to use '#' symbol or any other character that is not allowed by your operating system such as:\n" +
"':', '\\', etc...\n" +
"For more info: https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html\n")
public String dateTimeFormat = "dd.MM.yyyy_HH-mm-ss";
public Optional<String> sanitize() {
if(compressionCoreCountLimit > Runtime.getRuntime().availableProcessors())
return Optional.of("compressionCoreCountLimit is too big! Your system only has: " + Runtime.getRuntime().availableProcessors() + " cores!");
try {
DateTimeFormatter.ofPattern(dateTimeFormat);
} catch (IllegalArgumentException e) {
return Optional.of("dateTimeFormat is wrong!\n" + e.getMessage() + "\n See: https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html");
}
return Optional.empty();
}
public enum ArchiveFormat {
ZIP(".zip"),
GZIP(".tar.gz"),

13
src/main/java/net/szum123321/textile_backup/TextileBackup.java
View File

@ -23,7 +23,6 @@ import io.github.cottonmc.cotton.config.ConfigManager;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
import net.minecraft.server.command.ServerCommandSource;
import net.szum123321.textile_backup.commands.BlacklistCommand;
@ -34,6 +33,7 @@ import net.szum123321.textile_backup.core.BackupScheduler;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.Optional;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@ -50,12 +50,15 @@ public class TextileBackup implements ModInitializer {
public void onInitialize() {
config = ConfigManager.loadConfig(ConfigHandler.class);
registerCommands();
Optional<String> errorMessage = config.sanitize();
if(errorMessage.isPresent()) {
LOGGER.fatal("TextileBackup config file has wrong settings! \n" + errorMessage.get());
System.exit(1);
}
ServerTickEvents.END_SERVER_TICK.register(scheduler::tick);
}
private void registerCommands(){
CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> dispatcher.register(
LiteralArgumentBuilder.<ServerCommandSource>literal("backup")
.requires((ctx) -> {
@ -64,7 +67,7 @@ public class TextileBackup implements ModInitializer {
ctx.hasPermissionLevel(config.permissionLevel)) &&
!config.playerBlacklist.contains(ctx.getEntityOrThrow().getEntityName())) ||
(ctx.getMinecraftServer().isSinglePlayer() &&
config.alwaysSingleplayerAllowed);
config.alwaysSingleplayerAllowed);
} catch (Exception ignored) { //Command was called from server console.
return true;
}