From 34de8e3ff4872c7e48e78d1fa102aa029ac2b261 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Fri, 28 Dec 2018 02:10:33 +0000
Subject: [PATCH] It's a long way, but is it also useful?
---
borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ArchiveFilelistCache.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 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 5e06d74..6be9b6e 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
@@ -4,9 +4,7 @@
import de.micromata.borgbutler.data.Archive;
import de.micromata.borgbutler.data.FileSystemFilter;
import de.micromata.borgbutler.data.Repository;
-import de.micromata.borgbutler.json.borg.BorgFilesystemItem;
import de.micromata.borgbutler.utils.ReplaceUtils;
-import lombok.Getter;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
@@ -31,7 +29,7 @@
private int cacheArchiveContentMaxDiscSizeMB;
private long FILES_EXPIRE_TIME = 7 * 24 * 3660 * 1000; // Expires after 7 days.
- public void save(BorgRepoConfig repoConfig, Archive archive, List<BorgFilesystemItem> filesystemItems) {
+ public void save(BorgRepoConfig repoConfig, Archive archive, List<FilesystemItem> filesystemItems) {
if (CollectionUtils.isEmpty(filesystemItems)) {
return;
}
@@ -39,7 +37,7 @@
log.info("Saving archive content as file list: " + file.getAbsolutePath());
try (ObjectOutputStream outputStream = new ObjectOutputStream(new BufferedOutputStream(new GzipCompressorOutputStream(new FileOutputStream(file))))) {
outputStream.writeObject(filesystemItems.size());
- for (BorgFilesystemItem item : filesystemItems) {
+ for (FilesystemItem item : filesystemItems) {
outputStream.writeObject(item);
}
outputStream.writeObject("EOF");
@@ -66,7 +64,7 @@
* @param archive
* @return
*/
- public List<BorgFilesystemItem> load(BorgRepoConfig repoConfig, Archive archive) {
+ public List<FilesystemItem> load(BorgRepoConfig repoConfig, Archive archive) {
return load(repoConfig, archive, null);
}
@@ -80,7 +78,7 @@
* @param filter If given, only file items matching this filter are returned.
* @return
*/
- public List<BorgFilesystemItem> load(BorgRepoConfig repoConfig, Archive archive, FileSystemFilter filter) {
+ public List<FilesystemItem> load(BorgRepoConfig repoConfig, Archive archive, FileSystemFilter filter) {
File file = getFile(repoConfig, archive);
if (!file.exists()) {
return null;
@@ -93,13 +91,13 @@
* @param filter If given, only file items matching this filter are returned.
* @return
*/
- public List<BorgFilesystemItem> load(File file, FileSystemFilter filter) {
+ public List<FilesystemItem> load(File file, FileSystemFilter filter) {
if (!file.exists()) {
log.error("File '" + file.getAbsolutePath() + "' doesn't exist. Can't get archive content files.");
return null;
}
log.info("Loading archive content as file list from: " + file.getAbsolutePath());
- List<BorgFilesystemItem> list = null;
+ List<FilesystemItem> list = null;
try {
// Set last modified time of file:
Files.setAttribute(file.toPath(), "lastModifiedTime", FileTime.fromMillis(System.currentTimeMillis()));
@@ -118,9 +116,9 @@
for (int i = 0; i < size; i++) {
++fileNumber;
obj = inputStream.readObject();
- if (obj instanceof BorgFilesystemItem) {
- BorgFilesystemItem item = (BorgFilesystemItem) obj;
- item.setFileNumber(fileNumber);
+ if (obj instanceof FilesystemItem) {
+ FilesystemItem item = (FilesystemItem) obj;
+ // item.setFileNumber(fileNumber);
if (filter == null || filter.matches(item)) {
list.add(item);
if (filter != null && filter.isFinished()) break;
@@ -138,7 +136,7 @@
Collections.sort(list); // Sort by path (if archive list order wasn't correct).
log.info("Loading done.");
if (filter != null) {
- return filter.reduce(list);
+ // return filter.reduce(list);
}
return list;
}
--
Gitblit v1.10.0