From 931804558e725d5be7efbecb4e510e7360e65505 Mon Sep 17 00:00:00 2001 From: ThomasFok Date: Wed, 18 Jan 2023 20:00:20 +0000 Subject: [PATCH 1/4] RmdirCommand - ignore deleted file entries --- .../java/io/github/applecommander/acx/command/RmdirCommand.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/cli-acx/src/main/java/io/github/applecommander/acx/command/RmdirCommand.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/RmdirCommand.java index 4f047d8..e4b8984 100644 --- a/app/cli-acx/src/main/java/io/github/applecommander/acx/command/RmdirCommand.java +++ b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/RmdirCommand.java @@ -54,6 +54,7 @@ public class RmdirCommand extends ReadWriteDiskCommandOptions { final String pathName = formattedDisk.getSuggestedFilename(paths[i]); Optional optEntry = directory.getFiles().stream() .filter(entry -> entry.getFilename().equalsIgnoreCase(pathName)) + .filter(entry -> !entry.isDeleted()) .findFirst(); if (optEntry.isPresent()) { From 492d0633d94ab0630a382739f4f06a4ad57012f8 Mon Sep 17 00:00:00 2001 From: ThomasFok Date: Wed, 18 Jan 2023 20:26:15 +0000 Subject: [PATCH 2/4] FileUtils::copyFile() - ignore deleted files --- .../java/io/github/applecommander/acx/fileutil/FileUtils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/FileUtils.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/FileUtils.java index 9f21e5f..018871f 100644 --- a/app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/FileUtils.java +++ b/app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/FileUtils.java @@ -89,6 +89,7 @@ public class FileUtils { String sanitizedName = directory.getFormattedDisk().getSuggestedFilename(sourceName); final Optional fileEntry = directory.getFiles().stream() .filter(entry -> entry.getFilename().equals(sanitizedName)) + .filter(entry -> !entry.isDeleted()) .findFirst(); final FileEntry targetFile; From 1a189d659658f4d8f68a7abaa7ca55a31bf6ecd0 Mon Sep 17 00:00:00 2001 From: ThomasFok Date: Wed, 18 Jan 2023 21:24:18 +0000 Subject: [PATCH 3/4] FileUtils::copyDirectory() ignores deleted files --- .../java/io/github/applecommander/acx/fileutil/FileUtils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/FileUtils.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/FileUtils.java index 018871f..9891370 100644 --- a/app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/FileUtils.java +++ b/app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/FileUtils.java @@ -56,6 +56,7 @@ public class FileUtils { Optional targetFile = targetParent.getFiles() .stream() .filter(fileEntry -> name.equals(fileEntry.getFilename())) + .filter(fileEntry -> !fileEntry.isDeleted()) .findFirst(); Optional targetDir = targetFile .filter(FileEntry::isDirectory) From b128ef0c605c87915493a68aca71138a14f5255a Mon Sep 17 00:00:00 2001 From: ThomasFok Date: Thu, 19 Jan 2023 13:36:49 +0000 Subject: [PATCH 4/4] ImportCommand - ignore deleted file entries --- .../java/io/github/applecommander/acx/command/ImportCommand.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/cli-acx/src/main/java/io/github/applecommander/acx/command/ImportCommand.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/ImportCommand.java index 75efa07..a2c9885 100644 --- a/app/cli-acx/src/main/java/io/github/applecommander/acx/command/ImportCommand.java +++ b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/ImportCommand.java @@ -92,6 +92,7 @@ public class ImportCommand extends ReadWriteDiskCommandOptions { for (String dir : dirs) { Optional fileEntry = directory.getFiles().stream() .filter(f -> dir.equalsIgnoreCase(f.getFilename())) + .filter(f -> !f.isDeleted()) .findFirst(); Optional dirEntry = fileEntry .filter(FileEntry::isDirectory)