Upstream
/
SubServers-2
mirror of https://github.com/ME1312/SubServers-2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove small redundancies for removing file

This commit is contained in:
indexjoseph 2023-12-22 22:38:22 -05:00
parent f7f42c8ba9
commit c5486cf04b
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java
View File

@ -138,24 +138,16 @@ public final class ExHost {
reader.close();
if (json.keySet().contains("Timestamp")) {
if (TimeUnit.MILLISECONDS.toDays(Calendar.getInstance().getTime().getTime() - json.getLong("Timestamp")) >= 7) {
Directories.delete(file);
f--;
log.info.println("Removed ./Recently Deleted/" + file.getName());
f = removeFile(file, f, true);
}
} else {
Directories.delete(file);
f--;
log.info.println("Removed ./Recently Deleted/" + file.getName());
f = removeFile(file, f, true);
}
} else {
Directories.delete(file);
f--;
log.info.println("Removed ./Recently Deleted/" + file.getName());
f = removeFile(file, f, true);
}
} else {
Files.delete(file.toPath());
f--;
log.info.println("Removed ./Recently Deleted/" + file.getName());
f = removeFile(file, f, false);
}
} catch (Exception e) {
log.error.println(e);
@ -247,6 +239,26 @@ public final class ExHost {
}
}
/**
* Removes a file from the Recently Deleted folder and decrements the
* fileLength
*
* @param file The file to remove
* @param fileLength The current file length
* @param isDir Whether or not the file is a directory\
* @return The new file length
*/
private int removeFile(File file, int fileLength, boolean isDir) {
if(isDir) {
Directories.delete(file);
} else {
Files.delete(file.toPath());
}
fileLength--;
log.info.println("Removed ./Recently Deleted/" + file.getName());
return fileLength;
}
private void loadDefaults() {
new SubCommand(this).load();
}