mirror of https://github.com/micromata/borgbackup-butler.git

Kai Reinhard
24.39.2019 776fdaa788e0848a665e264b9be5453ce04bf97d
autoChangeDirectoryToLeafItem works now also for empty leaf directories.
2 files modified
29 ■■■■■ changed files
borgbutler-core/src/main/java/de/micromata/borgbutler/data/FileSystemFilter.java 5 ●●●●● patch | view | raw | blame | history
borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/BorgFilesystemItem.java 24 ●●●●● patch | view | raw | blame | history
borgbutler-core/src/main/java/de/micromata/borgbutler/data/FileSystemFilter.java
@@ -119,8 +119,9 @@
                if (topItem == null) {
                    log.error("Internal error, can't find subDirectory: " + topLevel);
                } else {
                    topItem.setDisplayPath(StringUtils.removeStart(topItem.getPath(), currentDirectory));
                    list.add(topItem);
                    BorgFilesystemItem cloneItem = autoChangeDirectoryToLeafItem ? topItem.clone() : topItem;
                    cloneItem.setDisplayPath(StringUtils.removeStart(topItem.getPath(), currentDirectory));
                    list.add(cloneItem);
                }
            }
        }
borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/BorgFilesystemItem.java
@@ -196,4 +196,28 @@
    public String toString() {
        return path;
    }
    @Override
    public BorgFilesystemItem clone() {
        BorgFilesystemItem clone = new BorgFilesystemItem();
        clone.type = this.type;
        clone.mode = this.mode;
        clone.user = this.user;
        clone.group = this.group;
        clone.uid = this.uid;
        clone.gid = this.gid;
        clone.path = this.path;
        clone.displayPath = this.displayPath;
        clone.healthy = this.healthy;
        clone.source = this.source;
        clone.linktarget = this.linktarget;
        clone.flags = this.flags;
        clone.mtime = this.mtime;
        clone.size = this.size;
        clone.fileNumber = this.fileNumber;
        clone.diffStatus = this.diffStatus;
        clone.diffItem = this.diffItem;
        clone.differences = this.differences;
        return clone;
    }
}