This corrects for a naming issue if the file is given on the command line; a full directory path causes issues.

a2geek · a2geek · commit 8954b5b2d382 · 2025-07-27T20:27:09.000-05:00
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
@@ -19,18 +19,6 @@
  */
 package io.github.applecommander.acx.command;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UncheckedIOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.function.Function;
-import java.util.logging.Logger;
-
 import com.webcodepro.applecommander.storage.DirectoryEntry;
 import com.webcodepro.applecommander.storage.FileEntry;
 import com.webcodepro.applecommander.storage.os.prodos.ProdosFormatDisk;
@@ -42,7 +30,6 @@
 import com.webcodepro.shrinkit.HeaderBlock;
 import com.webcodepro.shrinkit.NuFileArchive;
 import com.webcodepro.shrinkit.ThreadRecord;
-
 import io.github.applecommander.acx.base.ReadWriteDiskCommandOptions;
 import io.github.applecommander.acx.converter.IntegerTypeConverter;
 import io.github.applecommander.acx.fileutil.FileUtils;
@@ -60,6 +47,13 @@
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Parameters;
 
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.function.Function;
+import java.util.logging.Logger;
+
 @Command(name = "import", description = "Import file onto disk.",
          aliases = { "put" })
 public class ImportCommand extends ReadWriteDiskCommandOptions {
@@ -116,7 +110,7 @@ public int handleCommand() throws Exception {
                     new IOException(String.format("Directory '%s' not found.", dir)));
             }
         }
-        
+
         FileUtils copier = new FileUtils(overwriteFlag);
         FileEntryReader inputReader = inputData.get();
         for (FileEntryReader processorReader : processor.apply(inputReader)) {
@@ -161,7 +155,7 @@ public void fromFile(final String filename) {
                 byte[] data = Files.readAllBytes(path);
                 fileEntryReader = OverrideFileEntryReader.builder()
                         .fileData(data)
-                        .filename(filename)
+                        .filename(path.getFileName().toString())
                         .prodosFiletype("BIN")
                         .build();
             } catch (IOException e) {
@@ -365,7 +359,7 @@ private List<FileEntryReader> handleShrinkitMode(FileEntryReader reader) {
     }
     
     public static class Overrides {
-        @Option(names = { "-t", "--type" }, description = "ProDOS File type.  "
+        @Option(names = { "-t", "--type" }, description = "ProDOS or native file type.  "
                 + "(Each filesystem translates between it's native types and ProDOS.)")
         private Optional<String> fileType;
         
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
@@ -85,7 +85,7 @@ void copyFile(DirectoryEntry directory, FileEntry sourceFile) throws DiskExcepti
 	}
 	
 	public void copyFile(DirectoryEntry directory, FileEntryReader source) throws DiskException {
-	    String sourceName = source.getFilename().get();
+	    String sourceName = source.getFilename().orElseThrow();
 	    String sanitizedName = directory.getFormattedDisk().getSuggestedFilename(sourceName);
 	    final Optional<FileEntry> fileEntry = directory.getFiles().stream()
 	        .filter(entry -> entry.getFilename().equals(sanitizedName))

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ void copyFile(DirectoryEntry directory, FileEntry sourceFile) throws DiskExcepti`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`public void copyFile(DirectoryEntry directory, FileEntryReader source) throws DiskException {`
`88`		`- String sourceName = source.getFilename().get();`
	`88`	`+ String sourceName = source.getFilename().orElseThrow();`
`89`	`89`	`String sanitizedName = directory.getFormattedDisk().getSuggestedFilename(sourceName);`
`90`	`90`	`final Optional<FileEntry> fileEntry = directory.getFiles().stream()`
`91`	`91`	`.filter(entry -> entry.getFilename().equals(sanitizedName))`