Renamed getFileExtension -> getArchiveExtension

Some stylistic improvements
56-bugfix
szymon 2020-11-30 10:27:26 +01:00
parent aac63d45ac
commit a5114b49cc
1 changed files with 12 additions and 15 deletions

View File

@ -32,10 +32,7 @@ import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.attribute.FileTime; import java.nio.file.attribute.FileTime;
import java.time.Duration; import java.time.*;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.Optional; import java.util.Optional;
@ -52,17 +49,15 @@ public class Utilities {
public static void disableWorldSaving(MinecraftServer server) { public static void disableWorldSaving(MinecraftServer server) {
for (ServerWorld serverWorld : server.getWorlds()) { for (ServerWorld serverWorld : server.getWorlds()) {
if (serverWorld != null && !serverWorld.savingDisabled) { if (serverWorld != null && !serverWorld.savingDisabled)
serverWorld.savingDisabled = true; serverWorld.savingDisabled = true;
}
} }
} }
public static void enableWorldSaving(MinecraftServer server) { public static void enableWorldSaving(MinecraftServer server) {
for (ServerWorld serverWorld : server.getWorlds()) { for (ServerWorld serverWorld : server.getWorlds()) {
if (serverWorld != null && serverWorld.savingDisabled) { if (serverWorld != null && serverWorld.savingDisabled)
serverWorld.savingDisabled = false; serverWorld.savingDisabled = false;
}
} }
} }
@ -86,7 +81,7 @@ public class Utilities {
return false; return false;
} }
public static Optional<ConfigHandler.ArchiveFormat> getFileExtension(String fileName) { public static Optional<ConfigHandler.ArchiveFormat> getArchiveExtension(String fileName) {
String[] parts = fileName.split("\\."); String[] parts = fileName.split("\\.");
switch (parts[parts.length - 1]) { switch (parts[parts.length - 1]) {
@ -104,15 +99,15 @@ public class Utilities {
} }
} }
public static Optional<ConfigHandler.ArchiveFormat> getFileExtension(File f) { public static Optional<ConfigHandler.ArchiveFormat> getArchiveExtension(File f) {
return getFileExtension(f.getName()); return getArchiveExtension(f.getName());
} }
public static Optional<LocalDateTime> getFileCreationTime(File file) { public static Optional<LocalDateTime> getFileCreationTime(File file) {
LocalDateTime creationTime = null; LocalDateTime creationTime = null;
if(getFileExtension(file).isPresent()) { if(getArchiveExtension(file).isPresent()) {
String fileExtension = getFileExtension(file).get().getString(); String fileExtension = getArchiveExtension(file).get().getString();
try { try {
creationTime = LocalDateTime.from( creationTime = LocalDateTime.from(
@ -157,10 +152,12 @@ public class Utilities {
} }
public static boolean isValidBackup(File f) { public static boolean isValidBackup(File f) {
return getFileExtension(f).isPresent() && getFileCreationTime(f).isPresent() && isFileOk(f); return getArchiveExtension(f).isPresent() && getFileCreationTime(f).isPresent() && isFileOk(f);
} }
public static boolean isFileOk(File f) {return f.exists() && f.isFile(); } public static boolean isFileOk(File f) {
return f.exists() && f.isFile();
}
public static DateTimeFormatter getDateTimeFormatter() { public static DateTimeFormatter getDateTimeFormatter() {
return DateTimeFormatter.ofPattern(Statics.CONFIG.dateTimeFormat); return DateTimeFormatter.ofPattern(Statics.CONFIG.dateTimeFormat);