From 0c50069ac877873f511e6d698cc8d3e78a4cd608 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Mon, 10 Dec 2018 07:27:17 +0000
Subject: [PATCH] Old cache mechanism removed.
---
borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ButlerCache.java | 61 ++++++------------------------
1 files changed, 12 insertions(+), 49 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ButlerCache.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ButlerCache.java
index 15a5334..b3ae45e 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ButlerCache.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ButlerCache.java
@@ -4,11 +4,7 @@
import de.micromata.borgbutler.BorgCommands;
import de.micromata.borgbutler.config.BorgRepoConfig;
import de.micromata.borgbutler.config.ConfigurationHandler;
-import de.micromata.borgbutler.json.borg.Archive;
-import de.micromata.borgbutler.json.borg.FilesystemItem;
-import de.micromata.borgbutler.json.borg.RepoInfo;
-import de.micromata.borgbutler.json.borg.Repository;
-import lombok.Getter;
+import de.micromata.borgbutler.json.borg.*;
import org.apache.commons.jcs.access.CacheAccess;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -25,11 +21,7 @@
private JCSCache jcsCache = JCSCache.getInstance();
private CacheAccess<String, RepoInfo> repoInfoCacheAccess;
- @Getter
- private RepoListCache repoListCache;
- private ArchiveListCache archiveListCache;
- private List<AbstractElementsCache> caches;
- private List<ArchiveFileListCache> archiveFileListCaches;
+ private CacheAccess<String, RepoList> repoListCacheAccess;
@JsonIgnore
private File cacheDir;
@@ -38,12 +30,6 @@
return instance;
}
- public void save() {
- for (AbstractElementsCache cache : caches) {
- cache.save();
- }
- }
-
public Repository getRepository(String idOrName) {
RepoInfo repoInfo = getRepoInfo(idOrName);
if (repoInfo == null) {
@@ -77,38 +63,19 @@
return repositories;
}
- public List<FilesystemItem> getArchiveContent(BorgRepoConfig repoConfig, Archive archive) {
+ public RepoList getRepoList(String idOrName) {
+ BorgRepoConfig repoConfig = ConfigurationHandler.getConfiguration().getRepoConfig(idOrName);
+ ArchiveInfo archiveInfo = BorgCommands.info(repoConfig, repoConfig.getRepo());
+ RepoList repoList = BorgCommands.list(repoConfig);
+ return null;
+ }
+
+ public List<FilesystemItem> getArchiveContent_(BorgRepoConfig repoConfig, Archive archive) {
if (archive == null || StringUtils.isBlank(archive.getArchive())) {
return null;
}
- ArchiveFileListCache cache = null;
- for (ArchiveFileListCache existingCache : archiveFileListCaches) {
- if (archive.equals(existingCache.getArchive())) {
- // Cache is already known:
- cache = existingCache;
- break;
- }
- }
- if (cache == null) {
- cache = new ArchiveFileListCache(cacheDir, repoConfig, archive);
- }
- return cache.getContent(repoConfig);
- }
-
- /**
- * Removes all cache files and clears all caches.
- */
- public void removeAllCacheFiles() {
- File[] files = cacheDir.listFiles();
- for (File file : files) {
- if (AbstractElementsCache.isCacheFile(file)) {
- log.info("Deleting cache file: " + file.getAbsolutePath());
- file.delete();
- }
- }
- for (AbstractElementsCache cache : caches) {
- cache.clear();
- }
+ List<FilesystemItem> content = BorgCommands.list(repoConfig, archive);
+ return content;
}
private ButlerCache() {
@@ -117,10 +84,6 @@
log.info("Creating cache dir: " + cacheDir.getAbsolutePath());
cacheDir.mkdir();
}
- caches = new ArrayList<>();
- caches.add(repoListCache = new RepoListCache(cacheDir));
- caches.add(archiveListCache = new ArchiveListCache(cacheDir));
- archiveFileListCaches = new ArrayList<>();
this.repoInfoCacheAccess = jcsCache.getJCSCache();
}
}
--
Gitblit v1.10.0