From 1f9b179749dfdf3c9f0c103d83f3b9ef9613f50a Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sun, 16 Dec 2018 17:34:58 +0000
Subject: [PATCH] Filtering (text search and max result size) works now for file lists.
---
borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ArchivesRest.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ArchivesRest.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ArchivesRest.java
index 1e8acfe..a444b3b 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ArchivesRest.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ArchivesRest.java
@@ -2,6 +2,7 @@
import de.micromata.borgbutler.cache.ButlerCache;
import de.micromata.borgbutler.data.Archive;
+import de.micromata.borgbutler.data.FileSystemFilter;
import de.micromata.borgbutler.data.Repository;
import de.micromata.borgbutler.json.JsonUtils;
import de.micromata.borgbutler.json.borg.BorgFilesystemItem;
@@ -50,14 +51,18 @@
* @see JsonUtils#toJson(Object, boolean)
*/
public String getArchiveFileLIst(@QueryParam("archiveId") String archiveId,
- @QueryParam("search") String search,
+ @QueryParam("searchString") String searchString,
@QueryParam("maxResultSize") String maxResultSize,
@QueryParam("force") boolean force,
@QueryParam("prettyPrinter") boolean prettyPrinter) {
int maxSize = NumberUtils.toInt(maxResultSize, 50);
- List<BorgFilesystemItem> items = ButlerCache.getInstance().getArchiveContent(archiveId, force, maxSize);
+ FileSystemFilter filter = new FileSystemFilter()
+ .setSearchString(searchString)
+ .setMaxResultSize(maxSize);
+ List<BorgFilesystemItem> items = ButlerCache.getInstance().getArchiveContent(archiveId, force,
+ filter);
if (items == null) {
- return "[]";
+ return "[{patch: 'notLoaded'}]";
}
return JsonUtils.toJson(items, prettyPrinter);
}
--
Gitblit v1.10.0