From 60b424b101e42fa1aadb9300f32a842c9681a092 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 15 Dec 2018 22:39:43 +0000
Subject: [PATCH] Only one JCS cache for repositories containing also archives.
---
borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ArchiveFilelistCache.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 4b9ef45..3b55521 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,6 +1,7 @@
package de.micromata.borgbutler.cache;
import de.micromata.borgbutler.config.BorgRepoConfig;
+import de.micromata.borgbutler.data.Archive;
import de.micromata.borgbutler.json.borg.BorgArchive;
import de.micromata.borgbutler.json.borg.BorgFilesystemItem;
import de.micromata.borgbutler.utils.ReplaceUtils;
@@ -29,10 +30,10 @@
private long FILES_EXPIRE_TIME = 7 * 24 * 3660 * 1000; // Expires after 7 days.
@Getter
- private BorgArchive archive;
+ private Archive archive;
private List<BorgFilesystemItem> content;
- public void save(BorgRepoConfig repoConfig, BorgArchive archive, List<BorgFilesystemItem> filesystemItems) {
+ public void save(BorgRepoConfig repoConfig, Archive archive, List<BorgFilesystemItem> filesystemItems) {
File file = getFile(repoConfig, archive);
if (CollectionUtils.isEmpty(filesystemItems)) {
return;
@@ -57,7 +58,7 @@
* @param archive
* @return
*/
- public BorgFilesystemItem[] load(BorgRepoConfig repoConfig, BorgArchive archive) {
+ public BorgFilesystemItem[] load(BorgRepoConfig repoConfig, Archive archive) {
File file = getFile(repoConfig, archive);
if (!file.exists()) {
return null;
@@ -181,9 +182,9 @@
}
}
- File getFile(BorgRepoConfig repoConfig, BorgArchive archive) {
+ File getFile(BorgRepoConfig repoConfig, Archive archive) {
return new File(cacheDir, ReplaceUtils.encodeFilename(CACHE_ARCHIVE_LISTS_BASENAME + archive.getTime()
- + "-" + repoConfig.getRepo() + "-" + archive.getArchive() + ".gz", true));
+ + "-" + repoConfig.getRepo() + "-" + archive.getName() + ".gz", true));
}
ArchiveFilelistCache(File cacheDir, int cacheArchiveContentMaxDiscSizeMB) {
--
Gitblit v1.10.0