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

Better java 8 support

2.x-1.16
szymon 2020-08-04 17:32:43 +02:00
parent abc047c9d6
commit 1141c3500a
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/szum123321/textile_backup/core/restore/RestoreBackupRunnable.java
View File

@ -19,7 +19,7 @@
package net.szum123321.textile_backup.core.restore; package net.szum123321.textile_backup.core.restore;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.szum123321.textile_backup.LivingServer; import net.szum123321.textile_backup.core.LivingServer;
import net.szum123321.textile_backup.TextileBackup; import net.szum123321.textile_backup.TextileBackup;
import net.szum123321.textile_backup.core.Utilities; import net.szum123321.textile_backup.core.Utilities;
import net.szum123321.textile_backup.core.create.BackupContext; import net.szum123321.textile_backup.core.create.BackupContext;
@ -33,7 +33,7 @@ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.nio.channels.FileLock; import java.util.NoSuchElementException;
public class RestoreBackupRunnable implements Runnable { public class RestoreBackupRunnable implements Runnable {
private final MinecraftServer server; private final MinecraftServer server;
@ -76,7 +76,7 @@ public class RestoreBackupRunnable implements Runnable {
try(FileInputStream fileInputStream = new FileInputStream(backupFile)) { try(FileInputStream fileInputStream = new FileInputStream(backupFile)) {
TextileBackup.LOGGER.info("Starting decompression..."); TextileBackup.LOGGER.info("Starting decompression...");
switch(Utilities.getFileExtension(backupFile).orElseThrow()) { switch(Utilities.getFileExtension(backupFile).orElseThrow(() -> new NoSuchElementException("Couldn't get file extention!"))) {
case ZIP: case ZIP:
ZipDecompressor.decompress(fileInputStream, worldFile); ZipDecompressor.decompress(fileInputStream, worldFile);
break; break;
@ -103,10 +103,9 @@ public class RestoreBackupRunnable implements Runnable {
private void waitDelay() { private void waitDelay() {
int delay = TextileBackup.CONFIG.restoreDelay; int delay = TextileBackup.CONFIG.restoreDelay;
while(delay > 0) { if(delay > 0) {
try { try {
Thread.sleep(1000); Thread.sleep(1000 * delay);
delay--;
} catch (InterruptedException e) { } catch (InterruptedException e) {
TextileBackup.LOGGER.error("Exception occurred!", e); TextileBackup.LOGGER.error("Exception occurred!", e);
} }

9
src/main/java/net/szum123321/textile_backup/core/restore/RestoreHelper.java
View File

@ -22,13 +22,12 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.text.LiteralText; import net.minecraft.text.LiteralText;
import net.szum123321.textile_backup.TextileBackup; import net.szum123321.textile_backup.TextileBackup;
import net.szum123321.textile_backup.core.Utilities; import net.szum123321.textile_backup.core.Utilities;
import net.szum123321.textile_backup.core.create.BackupContext;
import net.szum123321.textile_backup.core.create.BackupHelper;
import java.io.File; import java.io.File;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.NoSuchElementException;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class RestoreHelper { public class RestoreHelper {
@ -38,7 +37,7 @@ public class RestoreHelper {
.filter(file -> Utilities.getFileCreationTime(file).isPresent()) .filter(file -> Utilities.getFileCreationTime(file).isPresent())
.filter(file -> Utilities.getFileCreationTime(file).get().equals(backupTime)) .filter(file -> Utilities.getFileCreationTime(file).get().equals(backupTime))
.findFirst() .findFirst()
.orElseThrow(); .orElseThrow(() -> new NoSuchElementException("Couldn't find given backup file!"));
server.getPlayerManager().getPlayerList() server.getPlayerManager().getPlayerList()
.forEach(serverPlayerEntity -> serverPlayerEntity.sendMessage(new LiteralText("Warning! The server is going to shut down in " + TextileBackup.CONFIG.restoreDelay + " seconds!"), false)); .forEach(serverPlayerEntity -> serverPlayerEntity.sendMessage(new LiteralText("Warning! The server is going to shut down in " + TextileBackup.CONFIG.restoreDelay + " seconds!"), false));
@ -64,8 +63,8 @@ public class RestoreHelper {
private final String comment; private final String comment;
protected RestoreableFile(File file) { protected RestoreableFile(File file) {
String extension = Utilities.getFileExtension(file).orElseThrow().getString(); String extension = Utilities.getFileExtension(file).orElseThrow(() -> new NoSuchElementException("Couldn't get file extention")).getString();
this.creationTime = Utilities.getFileCreationTime(file).orElseThrow(); this.creationTime = Utilities.getFileCreationTime(file).orElseThrow(() -> new NoSuchElementException("Couldn't get file creation time."));
final String filename = file.getName(); final String filename = file.getName();