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

Renamed isValid -> isValidBackup

2.x-1.16
szymon 2020-08-11 09:51:34 +02:00
parent 786666f827
commit 7b6531185d
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/szum123321/textile_backup/core/Utilities.java
View File

@ -151,10 +151,12 @@ public class Utilities {
return path; return path;
} }
public static boolean isValid(File f) { public static boolean isValidBackup(File f) {
return getFileExtension(f).isPresent() && getFileCreationTime(f).isPresent(); return getFileExtension(f).isPresent() && getFileCreationTime(f).isPresent() && isFileOk(f);
} }
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);
} }

9
src/main/java/net/szum123321/textile_backup/core/create/BackupHelper.java
View File

@ -67,8 +67,7 @@ public class BackupHelper {
final LocalDateTime now = LocalDateTime.now(); final LocalDateTime now = LocalDateTime.now();
Arrays.stream(root.listFiles()) Arrays.stream(root.listFiles())
.filter(BackupHelper::isFileOk) .filter(Utilities::isValidBackup)// We check if we can get file's creation date so that the next line won't throw an exception
.filter(Utilities::isValid)// We check if we can get file's creation date so that the next line won't throw an exception
.filter(f -> now.toEpochSecond(ZoneOffset.UTC) - Utilities.getFileCreationTime(f).get().toEpochSecond(ZoneOffset.UTC) > Statics.CONFIG.maxAge) .filter(f -> now.toEpochSecond(ZoneOffset.UTC) - Utilities.getFileCreationTime(f).get().toEpochSecond(ZoneOffset.UTC) > Statics.CONFIG.maxAge)
.forEach(f -> { .forEach(f -> {
if(deleteFile(f, ctx)) if(deleteFile(f, ctx))
@ -80,8 +79,7 @@ public class BackupHelper {
int i = root.listFiles().length; int i = root.listFiles().length;
Iterator<File> it = Arrays.stream(root.listFiles()) Iterator<File> it = Arrays.stream(root.listFiles())
.filter(BackupHelper::isFileOk) .filter(Utilities::isValidBackup)
.filter(Utilities::isValid)
.sorted(Comparator.comparing(f -> Utilities.getFileCreationTime(f).get())) .sorted(Comparator.comparing(f -> Utilities.getFileCreationTime(f).get()))
.iterator(); .iterator();
@ -95,8 +93,7 @@ public class BackupHelper {
if (Statics.CONFIG.maxSize > 0 && FileUtils.sizeOfDirectory(root) / 1024 > Statics.CONFIG.maxSize) { if (Statics.CONFIG.maxSize > 0 && FileUtils.sizeOfDirectory(root) / 1024 > Statics.CONFIG.maxSize) {
Iterator<File> it = Arrays.stream(root.listFiles()) Iterator<File> it = Arrays.stream(root.listFiles())
.filter(BackupHelper::isFileOk) .filter(Utilities::isValidBackup)
.filter(Utilities::isValid)
.sorted(Comparator.comparing(f -> Utilities.getFileCreationTime(f).get())) .sorted(Comparator.comparing(f -> Utilities.getFileCreationTime(f).get()))
.iterator(); .iterator();

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

@ -36,8 +36,7 @@ public class RestoreHelper {
File root = Utilities.getBackupRootPath(Utilities.getLevelName(server)); File root = Utilities.getBackupRootPath(Utilities.getLevelName(server));
Optional<File> optionalFile = Arrays.stream(root.listFiles()) Optional<File> optionalFile = Arrays.stream(root.listFiles())
.filter(File::isFile) .filter(Utilities::isValidBackup)
.filter(Utilities::isValid)
.filter(file -> Utilities.getFileCreationTime(file).get().equals(backupTime)) .filter(file -> Utilities.getFileCreationTime(file).get().equals(backupTime))
.findFirst(); .findFirst();
@ -62,8 +61,7 @@ public class RestoreHelper {
File root = Utilities.getBackupRootPath(Utilities.getLevelName(server)); File root = Utilities.getBackupRootPath(Utilities.getLevelName(server));
return Arrays.stream(root.listFiles()) return Arrays.stream(root.listFiles())
.filter(File::isFile) .filter(Utilities::isValidBackup)
.filter(Utilities::isValid)
.map(RestoreableFile::new) .map(RestoreableFile::new)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }