Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-11-07 19:31:45 +01:00
Code Issues Projects Releases Wiki Activity

Refactored file deletion checks for JSONFileStorage

Browse Source
This commit is contained in:
Risto Lahtela 2021-02-12 09:34:48 +02:00
parent 5c01cde102
commit c0a210956d
1 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/cache/JSONFileStorage.java vendored
View File

@ -198,19 +198,26 @@ public class JSONFileStorage implements JSONStorage {
List<File> toDelete = new ArrayList<>();
for (File file : stored) {
if (shouldDeleteFile(identifier, timestamp, toDelete, file)) {
toDelete.add(file);
}
}
deleteFiles(toDelete);
}
private boolean shouldDeleteFile(String identifier, long timestamp, List<File> toDelete, File file) {
try {
String fileName = file.getName();
if (fileName.endsWith(JSON_FILE_EXTENSION) && fileName.startsWith(identifier)) {
Matcher timestampMatch = timestampRegex.matcher(fileName);
if (timestampMatch.find() && Long.parseLong(timestampMatch.group(1)) < timestamp) {
toDelete.add(file);
return true;
}
}
} catch (NumberFormatException e) {
// Ignore this file, malformed timestamp
}
}
deleteFiles(toDelete);
return false;
}
private void invalidateOlderButIgnore(long timestamp, String... ignoredIdentifiers) {
@ -218,25 +225,32 @@ public class JSONFileStorage implements JSONStorage {
if (stored == null) return;
List<File> toDelete = new ArrayList<>();
outer:
for (File file : stored) {
if (shouldDeleteFile(timestamp, file, ignoredIdentifiers)) {
toDelete.add(file);
}
}
deleteFiles(toDelete);
}
private boolean shouldDeleteFile(long timestamp, File file, String[] ignoredIdentifiers) {
try {
String fileName = file.getName();
if (fileName.endsWith(JSON_FILE_EXTENSION)) {
Matcher timestampMatch = timestampRegex.matcher(fileName);
if (timestampMatch.find() && Long.parseLong(timestampMatch.group(1)) < timestamp) {
boolean isOlder = timestampMatch.find() && Long.parseLong(timestampMatch.group(1)) < timestamp;
if (isOlder) {
for (String ignoredIdentifier : ignoredIdentifiers) {
if (fileName.startsWith(ignoredIdentifier)) continue outer;
if (fileName.startsWith(ignoredIdentifier)) return false;
}
toDelete.add(file);
return true;
}
}
} catch (NumberFormatException e) {
// Ignore this file, malformed timestamp
}
}
deleteFiles(toDelete);
return false;
}
private void deleteFiles(List<File> toDelete) {