Remove small redundancies for removing file
This commit is contained in:
parent
f7f42c8ba9
commit
c5486cf04b
|
@ -138,24 +138,16 @@ public final class ExHost {
|
||||||
reader.close();
|
reader.close();
|
||||||
if (json.keySet().contains("Timestamp")) {
|
if (json.keySet().contains("Timestamp")) {
|
||||||
if (TimeUnit.MILLISECONDS.toDays(Calendar.getInstance().getTime().getTime() - json.getLong("Timestamp")) >= 7) {
|
if (TimeUnit.MILLISECONDS.toDays(Calendar.getInstance().getTime().getTime() - json.getLong("Timestamp")) >= 7) {
|
||||||
Directories.delete(file);
|
f = removeFile(file, f, true);
|
||||||
f--;
|
|
||||||
log.info.println("Removed ./Recently Deleted/" + file.getName());
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Directories.delete(file);
|
f = removeFile(file, f, true);
|
||||||
f--;
|
|
||||||
log.info.println("Removed ./Recently Deleted/" + file.getName());
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Directories.delete(file);
|
f = removeFile(file, f, true);
|
||||||
f--;
|
|
||||||
log.info.println("Removed ./Recently Deleted/" + file.getName());
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Files.delete(file.toPath());
|
f = removeFile(file, f, false);
|
||||||
f--;
|
|
||||||
log.info.println("Removed ./Recently Deleted/" + file.getName());
|
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error.println(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() {
|
private void loadDefaults() {
|
||||||
new SubCommand(this).load();
|
new SubCommand(this).load();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue