From 27110bb6ff69743500cb1b7bb5b7b730efb99570 Mon Sep 17 00:00:00 2001
From: a2geek <robgreene@gmail.com>
Date: Sat, 10 Oct 2026 11:39:21 -0500
Subject: [PATCH] Worked a bit more on image creation wizard. Now creates
 proper sector device (disk, not HDD). Filename is set more appropriately and
 carried into the save as dialog.

---
 .../javafx/FileStoreWindow.java               |   5 +-
 .../javafx/wizard/CreateFileStoreWizard.java  | 108 +++++++++++++++---
 2 files changed, 93 insertions(+), 20 deletions(-)

diff --git a/app/gui-javafx/src/main/java/org/applecommander/javafx/FileStoreWindow.java b/app/gui-javafx/src/main/java/org/applecommander/javafx/FileStoreWindow.java
index 560785f0..26b5060e 100644
--- a/app/gui-javafx/src/main/java/org/applecommander/javafx/FileStoreWindow.java
+++ b/app/gui-javafx/src/main/java/org/applecommander/javafx/FileStoreWindow.java
@@ -359,6 +359,9 @@ public class FileStoreWindow {
             fileChooser.getExtensionFilters().add(new ExtensionFilter(extension.description(), extension.extensions()));
         }
 
+        FileStore fileStore = fileStoreSelection.getSelectedItem();
+        Source source = fileStore.get(Source.class).orElseThrow();
+        fileChooser.setInitialFileName(source.getName());
         File selectedFile = fileChooser.showSaveDialog(primaryStage);
         if (selectedFile == null) {
             return;
@@ -366,8 +369,6 @@ public class FileStoreWindow {
         Settings.setLastOpenedDirectory(selectedFile.getParentFile());
 
         try {
-            FileStore fileStore = fileStoreSelection.getSelectedItem();
-            Source source = fileStore.get(Source.class).orElseThrow();
             Files.write(selectedFile.toPath(), source.readAllBytes().asBytes(), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
             Optional<Source> newSource = Sources.create(selectedFile);
             openImage(newSource.orElseThrow(), false);
diff --git a/app/gui-javafx/src/main/java/org/applecommander/javafx/wizard/CreateFileStoreWizard.java b/app/gui-javafx/src/main/java/org/applecommander/javafx/wizard/CreateFileStoreWizard.java
index 5cf99d1e..ee8a397d 100644
--- a/app/gui-javafx/src/main/java/org/applecommander/javafx/wizard/CreateFileStoreWizard.java
+++ b/app/gui-javafx/src/main/java/org/applecommander/javafx/wizard/CreateFileStoreWizard.java
@@ -27,14 +27,15 @@ import javafx.geometry.Insets;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.layout.GridPane;
-import org.applecommander.device.DosOrderedTrackSectorDevice;
-import org.applecommander.device.TrackSectorDevice;
+import org.applecommander.device.*;
+import org.applecommander.image.NibbleImage;
 import org.applecommander.javafx.FXControls;
 import org.applecommander.os.gamedos.GamedosFileStoreFactory;
 import org.applecommander.source.DataBufferSource;
 import org.applecommander.source.Source;
 
 import java.util.Map;
+import java.util.Optional;
 
 public class CreateFileStoreWizard extends WizardDialog<CreateFileStoreWizard.WizardPage> {
     private final ObjectProperty<FileStoreSelection> fileStoreSelectionProperty = new SimpleObjectProperty<>();
@@ -47,12 +48,39 @@ public class CreateFileStoreWizard extends WizardDialog<CreateFileStoreWizard.Wi
     }
 
     public Source getSource() {
-        Source source = DataBufferSource.create(DiskConstants.APPLE_140KB_DISK, "BLANK.DISK").get();
-        TrackSectorDevice device = new DosOrderedTrackSectorDevice(source);
-        GamedosFileStoreFactory.create(device);
+        // Generate a starting filename:
+        String fileName = String.format("New Disk.%s",
+                imageSizeSelectionProperty.get().getAlternateFileExtension().orElse(
+                        sectorOrderSelectionProperty.get().getFileExtension()));
+
+        // Adjust image size if we picked nibble order, otherwise use the size selected:
+        int imageSize = sectorOrderSelectionProperty.get().getAlternateSize()
+                .orElse(imageSizeSelectionProperty.get().getSize());
+        Source source = DataBufferSource.create(imageSize, fileName).get();
+
+        // For now, the file store is _transitory_ and it just formats the source.
+        switch (fileStoreSelectionProperty.get().getDeviceType()) {
+            case DeviceType.BLOCK -> {
+                // TODO
+            }
+            case SECTOR -> {
+                TrackSectorDevice device = createTrackSectorDevice(source);
+                GamedosFileStoreFactory.create(device);
+            }
+        }
         return source;
     }
 
+    public TrackSectorDevice createTrackSectorDevice(Source source) {
+        return switch (sectorOrderSelectionProperty.get()) {
+            case DOS -> new DosOrderedTrackSectorDevice(source);
+            case PRODOS -> new BlockToTrackSectorAdapter(new ProdosOrderedBlockDevice(source,
+                    BlockDevice.STANDARD_BLOCK_SIZE), new ProdosBlockToTrackSectorAdapterStrategy());
+            case NIBBLE -> SkewedTrackSectorDevice.physicalToDosSkew(
+                    TrackSectorNibbleDevice.create(new NibbleImage(source), 16));
+        };
+    }
+
     public BooleanBinding createNextPageBinding() {
         return currentPageProperty().isEqualTo(WizardPage.FILESTORE).and(fileStoreSelectionProperty.isNull())
                 .or(currentPageProperty().isEqualTo(WizardPage.SIZE).and(imageSizeSelectionProperty.isNull()))
@@ -131,52 +159,96 @@ public class CreateFileStoreWizard extends WizardDialog<CreateFileStoreWizard.Wi
         };
     }
 
+    /// All possible pages in the new file store wizard.
     public enum WizardPage {
         FILESTORE, SIZE, SECTOR, SUMMARY
     }
+
+    /// Possible device types. Using an enum since there are a number of subclasses.
+    /// This limits the options to just two: sector or block.
+    public enum DeviceType {
+        SECTOR, BLOCK
+    }
+
+    /// Filestore selection options.
     public enum FileStoreSelection {
-        GAMEDOS("GameDOS");
+        GAMEDOS("GameDOS", DeviceType.SECTOR);
 
         private final String text;
+        private final DeviceType deviceType;
 
-        FileStoreSelection(String text) {
+        FileStoreSelection(String text, DeviceType deviceType) {
             this.text = text;
+            this.deviceType = deviceType;
         }
+
         public String getText() {
             return text;
         }
+        public DeviceType getDeviceType() {
+            return deviceType;
+        }
     }
+
+    /// Image size selection options. Includes the expected image size.
+    /// Note that 140KB can be altered based on sector order choice.
     public enum ImageSizeSelection {
-        DISK_140K("140KiB 5.25\" Floppy"),
-        DISK_800K("800KiB 3.5\" Floppy"),
-        HDD_5M("5MiB Hard Disk"),
-        HDD_10M("10MiB Hard Disk"),
-        HDD_20M("20MiB Hard Disk"),
-        HDD_32M("32MiB Hard Disk");
+        DISK_140K("140KiB 5.25\" Floppy", DiskConstants.APPLE_140KB_DISK, null),
+        DISK_800K("800KiB 3.5\" Floppy", DiskConstants.APPLE_800KB_DISK, null),
+        HDD_5M("5MiB Hard Disk", DiskConstants.APPLE_5MB_HARDDISK, "hdv"),
+        HDD_10M("10MiB Hard Disk", DiskConstants.APPLE_10MB_HARDDISK, "hdv"),
+        HDD_20M("20MiB Hard Disk", DiskConstants.APPLE_20MB_HARDDISK, "hdv"),
+        HDD_32M("32MiB Hard Disk", DiskConstants.APPLE_32MB_HARDDISK, "hdv");
 
         private final String text;
+        private final int size;
+        private final String alternateFileExtension;
 
-        ImageSizeSelection(String text) {
+        ImageSizeSelection(String text, int size, String alternateFileExtension) {
             this.text = text;
+            this.size = size;
+            this.alternateFileExtension = alternateFileExtension;
         }
 
         public String getText() {
             return text;
         }
+        public int getSize() {
+            return size;
+        }
+        public Optional<String> getAlternateFileExtension() {
+            return Optional.ofNullable(alternateFileExtension);
+        }
     }
+
+    /// Sector ordering selection. Note that this enum allows an override on the size of the disk;
+    /// specifically for nibble based images.
     public enum SectorOrderSelection {
-        DOS("DOS Ordered"),
-        PRODOS("ProDOS/Pascal Ordered"),
-        NIBBLE("Nibble Image");
+        DOS("DOS Ordered", -1, "do"),
+        PRODOS("ProDOS/Pascal Ordered", -1, "po"),
+        NIBBLE("Nibble Image", DiskConstants.APPLE_140KB_NIBBLE_DISK, "nib");
 
         private final String text;
+        private final int alternateSize;
+        private final String fileExtension;
 
-        SectorOrderSelection(String text) {
+        SectorOrderSelection(String text, int alternateSize, String fileExtension) {
             this.text = text;
+            this.alternateSize = alternateSize;
+            this.fileExtension = fileExtension;
         }
 
         public String getText() {
             return text;
         }
+        public Optional<Integer> getAlternateSize() {
+            if (alternateSize != -1) {
+                return Optional.of(alternateSize);
+            }
+            return Optional.empty();
+        }
+        public String getFileExtension() {
+            return fileExtension;
+        }
     }
 }