Merge pull request #97 from ThomasFok/fix/ignore_deleted_files

acx - Filter out deleted file entries

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> fileEntry = directory.getFiles().stream()
                         .filter(f -> dir.equalsIgnoreCase(f.getFilename()))
+                        .filter(f -> !f.isDeleted())
                         .findFirst();
                 Optional<DirectoryEntry> dirEntry = fileEntry
                         .filter(FileEntry::isDirectory)

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<FileEntry> optEntry = directory.getFiles().stream()
                     .filter(entry -> entry.getFilename().equalsIgnoreCase(pathName))
+                    .filter(entry -> !entry.isDeleted())
                     .findFirst();
             
             if (optEntry.isPresent()) {

app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/FileUtils.java

@@ -56,6 +56,7 @@ public class FileUtils {
 	    Optional<FileEntry> targetFile = targetParent.getFiles()
 	            .stream()
 	            .filter(fileEntry -> name.equals(fileEntry.getFilename()))
+                    .filter(fileEntry -> !fileEntry.isDeleted())
 	            .findFirst();
 	    Optional<DirectoryEntry> targetDir = targetFile
 	            .filter(FileEntry::isDirectory)
@@ -89,6 +90,7 @@ public class FileUtils {
 	    String sanitizedName = directory.getFormattedDisk().getSuggestedFilename(sourceName);
 	    final Optional<FileEntry> fileEntry = directory.getFiles().stream()
 	        .filter(entry -> entry.getFilename().equals(sanitizedName))
+                .filter(entry -> !entry.isDeleted())
 	        .findFirst();
 
         final FileEntry targetFile;