From 2acd2692251d5b45f2628034ebf68b97933496d4 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Mon, 10 Dec 2018 21:31:06 +0000
Subject: [PATCH] ...
---
borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ArchiveFilelistCache.java | 31 +++++++++++++++++++++++--------
borgbutler-core/src/test/java/de/micromata/borgbutler/cache/ArchiveFilelistCacheTest.java | 18 ++++++++++++++++++
2 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ArchiveFilelistCache.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ArchiveFilelistCache.java
index 0116df0..2fcd07d 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ArchiveFilelistCache.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ArchiveFilelistCache.java
@@ -1,7 +1,5 @@
package de.micromata.borgbutler.cache;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
import de.micromata.borgbutler.config.BorgRepoConfig;
import de.micromata.borgbutler.json.borg.Archive;
import de.micromata.borgbutler.json.borg.FilesystemItem;
@@ -18,13 +16,12 @@
class ArchiveFilelistCache {
private static Logger log = LoggerFactory.getLogger(ArchiveFilelistCache.class);
- public static final String CACHE_ARCHIVE_LISTS_BASENAME = "archive-content-";
+ private static final String CACHE_ARCHIVE_LISTS_BASENAME = "archive-content-";
+ private static final String CACHE_FILE_GZIP_EXTENSION = "gz";
private File cacheDir;
- @JsonIgnore
@Getter
private Archive archive;
- @JsonProperty
private List<FilesystemItem> content;
public void save(BorgRepoConfig repoConfig, Archive archive, List<FilesystemItem> filesystemItems) {
@@ -77,13 +74,31 @@
return list;
}
- private File getFile(BorgRepoConfig repoConfig, Archive archive) {
- return new File(cacheDir, ReplaceUtils.encodeFilename(CACHE_ARCHIVE_LISTS_BASENAME + "-"
- + repoConfig.getRepo() + "-" + archive.getArchive() + ".gz", true));
+ /**
+ * Deletes archive contents older than 7 days and deletes the oldest archive contents if the max cache size is
+ * exceeded.
+ */
+ public void cleanUp() {
+ File[] files = cacheDir.listFiles();
+ for (File file : files) {
+ if (isCacheFile(file)) {
+ log.info("Processing cache file: " + file.getAbsolutePath());
+ //file.delete();
+ }
+ }
+ }
+
+ File getFile(BorgRepoConfig repoConfig, Archive archive) {
+ return new File(cacheDir, ReplaceUtils.encodeFilename(CACHE_ARCHIVE_LISTS_BASENAME + archive.getTime()
+ + "-" + repoConfig.getRepo() + "-" + archive.getArchive() + ".gz", true));
}
ArchiveFilelistCache(File cacheDir) {
this.cacheDir = cacheDir;
}
+
+ private boolean isCacheFile(File file) {
+ return file.getName().startsWith(CACHE_ARCHIVE_LISTS_BASENAME);
+ }
}
diff --git a/borgbutler-core/src/test/java/de/micromata/borgbutler/cache/ArchiveFilelistCacheTest.java b/borgbutler-core/src/test/java/de/micromata/borgbutler/cache/ArchiveFilelistCacheTest.java
index 993043f..9a85eec 100644
--- a/borgbutler-core/src/test/java/de/micromata/borgbutler/cache/ArchiveFilelistCacheTest.java
+++ b/borgbutler-core/src/test/java/de/micromata/borgbutler/cache/ArchiveFilelistCacheTest.java
@@ -13,6 +13,7 @@
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class ArchiveFilelistCacheTest {
@@ -41,6 +42,23 @@
}
}
+ @Test
+ void readWriteEmptyTest() throws Exception {
+ List<FilesystemItem> list = new ArrayList<>();
+ ArchiveFilelistCache cache = new ArchiveFilelistCache(new File("out"));
+ BorgRepoConfig repoConfig = new BorgRepoConfig();
+ repoConfig.setRepo("repo");
+ Archive archive = new Archive();
+ set(archive, "archive", "archive-2018-12-09");
+ if (cache.getFile(repoConfig, archive).exists()) {
+ cache.getFile(repoConfig, archive).delete();
+ }
+ assertNull(cache.load(repoConfig, archive));
+ cache.save(repoConfig, archive, list);
+ FilesystemItem[] filesystemItems = cache.load(repoConfig, archive);
+ assertNull(cache.load(repoConfig, archive));
+ }
+
private FilesystemItem create(int i) throws Exception {
FilesystemItem item = new FilesystemItem();
set(item, "type", "-").set(item, "mode", "drwxr-xr-x")
--
Gitblit v1.10.0