From 3a7bdbc2d07d525c7858727d75a02c1b8eeaea4c Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sun, 16 Dec 2018 22:02:02 +0000
Subject: [PATCH] FileSystemFilter handles now maxResultSize.
---
borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ArchiveFilelistCache.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 beb3c2b..c3e930c 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
@@ -94,9 +94,7 @@
return null;
}
int size = (Integer) obj;
- int maxSize = filter != null ? filter.getMaxResultSize() : -1;
list = new ArrayList<>();
- int counter = 0;
int fileNumber = -1;
for (int i = 0; i < size; i++) {
++fileNumber;
@@ -105,7 +103,7 @@
BorgFilesystemItem item = (BorgFilesystemItem) obj;
if (filter == null || filter.matches(item)) {
list.add(item.setFileNumber(fileNumber));
- if (maxSize > 0 && counter++ >= maxSize) break;
+ if (filter != null && filter.isFinished()) break;
}
} else {
log.error("Can't load archive content. FilesystemItem expected, but received: "
@@ -123,7 +121,8 @@
/**
* Deletes archive contents older than 7 days and deletes the oldest archive contents if the max cache size is
- * exceeded. The last modified time of a file is equals to the last usage by {@link #load(BorgRepoConfig, Archive)}.
+ * exceeded. The last modified time of a file is equals to the last usage by
+ * {@link #load(BorgRepoConfig, Archive, FileSystemFilter)}.
*/
public void cleanUp() {
File[] files = cacheDir.listFiles();
--
Gitblit v1.10.0