Merge branch 'Mechazawa-applesingle'

Author: dfgordon

.gitignore

@@ -1,4 +1,6 @@
 target
 Cargo.lock
 **/special/*.woz
-**/special/scratch.json
+**/special/scratch.json
+.DS_Store
+.idea

CHANGELOG.md

@@ -10,14 +10,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixes
 
 * fix an issue where minifier level 3 could break valid code
-* fix some issues with handling of unusual WOZ tracks
+* fix some issues with handling of unusual WOZ layouts
 * correct various docstrings and log strings
 * register LSP commands (will be required by Neovim 0.13)
 
 ### New Features
 
 * create, read, and write with proprietary formats
     - from CLI use `--pro` argument with any disk image subcommand
+* support AppleSingle format (PR #2)
 * minify and renumber can be guarded by external references
 * CLI `mkdsk` supports creating blank or empty disks (issue #3)
 * support for quarter tracks
@@ -33,11 +34,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * modules `disk35` and `disk525` are eliminated
 * various public entities are eliminated from `img::woz`
-* changes to `DiskImage`
+* changes to `DiskImage` trait
     - eliminated `track-2ch`, `ch_2_track`
 * enumeration `img::NibbleCode` is eliminated 
 * removed functions `lang::merlin::eval_if`, `img::imd::cpm_blocking`
-* trait function args changed: `Renumber::build_edits`
+* trait function args or return values changed: `Renumber::build_edits`, `Packing::get_load_address`
 
 ## [3.7.0] - 2025-03-22
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "a2kit"
-version = "4.0.0-beta1"
+version = "4.0.0-beta2"
 edition = "2021"
 readme = "README.md"
 license = "MIT"
@@ -43,4 +43,5 @@ num-traits = "0.2.14"
 num-derive = "0.4"
 a2kit_macro = "1.0.0"
 a2kit_macro_derive = "1.0.0"
-retrocompressor = "1.0.0"
+retrocompressor = "1.0.0"
+binrw="0.14.0"

src/bin/server-merlin/request.rs

@@ -304,8 +304,9 @@ pub fn handle_request(
                                 resp = match item {
                                     disk_server::SelectionResult::Directory(dir) => Response::new_ok(req.id,serde_json::to_value(dir).expect("json")),
                                     disk_server::SelectionResult::FileData(mut sfimg) => {
-                                        // encode the load address in first two bytes
-                                        let mut ans = u16::to_le_bytes(sfimg.load_addr).to_vec();
+                                        // encode the load address in first two bytes, if there is a bank byte it is ignored
+                                        let addr16 = (sfimg.load_addr & 0xffff) as u16;
+                                        let mut ans = u16::to_le_bytes(addr16).to_vec();
                                         ans.append(&mut sfimg.data);
                                         Response::new_ok(req.id, serde_json::to_value(ans).expect("json"))
                                     }

src/bios/mod.rs

@@ -3,10 +3,11 @@
 //! This module is a place for any middleware we may require
 //! between the `fs` and `img` modules.  It is named in analogy
 //! with the CP/M concept of a BIOS as being (in part) a layer between
-//! the BDOS and the physical disk.
+//! the BDOS and the physical disk.  Tasks that live here include:
 //! 
-//! All the sector skewing tables are kept in this module.
-//! CP/M and FAT disk parameter blocks are here as well.
+//! * converting a block request into a sector request
+//! * maintaining sector skewing tables
+//! * maintaining parameter tables (such as CP/M DPB and FAT BPB)
 
 pub mod skew;
 pub mod dpb;

src/cli.rs

@@ -99,6 +99,7 @@ Detokenize from image: `a2kit get -f prog -t atok -d myimg.dsk | a2kit detokeniz
     let get_put_types = [
         "any",
         "auto",
+        "as",
         "bin",
         "txt",
         "raw",
@@ -115,6 +116,7 @@ Detokenize from image: `a2kit get -f prog -t atok -d myimg.dsk | a2kit detokeniz
 
     let pack_unpack_types = [
         "auto",
+        "as",
         "bin",
         "txt",
         "raw",

src/commands/get.rs

@@ -28,6 +28,7 @@ fn unpack_primitive(fimg: &FileImage,typ: ItemType,rec_len: Option<usize>,trunc:
     match typ {
         ItemType::Automatic => fimg.unpack(),
         ItemType::FileImage => Ok(UnpackedData::Text(fimg.to_json(indent))),
+        ItemType::AppleSingle => Ok(UnpackedData::Binary(fimg.unpack_apple_single()?)),
         ItemType::Records => Ok(UnpackedData::Text(fimg.unpack_rec_str(rec_len,indent)?)),
         ItemType::ApplesoftTokens => Ok(UnpackedData::Binary(fimg.unpack_tok()?)),
         ItemType::IntegerTokens => Ok(UnpackedData::Binary(fimg.unpack_tok()?)),

src/commands/mod.rs

@@ -52,19 +52,21 @@ pub enum CommandError {
     #[error("File not found")]
     FileNotFound,
     #[error("Key not found")]
-    KeyNotFound
+    KeyNotFound,
 }
 
 /// Types of files that may be distinguished by the file system or a2kit.
 /// This will have to be mapped to a similar enumeration at lower levels
 /// in order to obtain the binary type code.
 #[derive(PartialEq,Clone,Copy)]
 pub enum ItemType {
+    FileImage,
+    Automatic,
+    AppleSingle,
     Raw,
     Binary,
     Text,
     Records,
-    FileImage,
     ApplesoftText,
     IntegerText,
     MerlinText,
@@ -79,18 +81,19 @@ pub enum ItemType {
     RawTrack,
     System,
     Metadata,
-    Automatic
 }
 
 impl FromStr for ItemType {
     type Err = CommandError;
     fn from_str(s: &str) -> Result<Self,Self::Err> {
         match s {
+            "any" => Ok(Self::FileImage),
+            "auto" => Ok(Self::Automatic),
+            "as" => Ok(Self::AppleSingle),
             "raw" => Ok(Self::Raw),
             "bin" => Ok(Self::Binary),
             "txt" => Ok(Self::Text),
             "rec" => Ok(Self::Records),
-            "any" => Ok(Self::FileImage),
             "atxt" => Ok(Self::ApplesoftText),
             "itxt" => Ok(Self::IntegerText),
             "mtxt" => Ok(Self::MerlinText),
@@ -105,7 +108,6 @@ impl FromStr for ItemType {
             "sec" => Ok(Self::Sector),
             "sys" => Ok(Self::System),
             "meta" => Ok(Self::Metadata),
-            "auto" => Ok(Self::Automatic),
             _ => Err(CommandError::UnknownItemType)
         }
     }

src/commands/put.rs

@@ -1,7 +1,7 @@
 use clap;
 use std::io::Read;
 use std::str::FromStr;
-use super::{ItemType,CommandError};
+use super::{ItemType, CommandError};
 use crate::fs::FileImage;
 use crate::STDRESULT;
 
@@ -10,20 +10,22 @@ const RANGED_ACCESS: &str =
 
 fn pack_primitive(fimg: &mut FileImage, dat: &[u8], load_addr: Option<usize>, typ: ItemType) -> STDRESULT {
     match typ {
-        ItemType::Raw => fimg.pack_raw(&dat),
-        ItemType::Binary => fimg.pack_bin(&dat,load_addr,None),
-        ItemType::ApplesoftTokens => fimg.pack_tok(&dat,ItemType::ApplesoftTokens,None),
-        ItemType::IntegerTokens => fimg.pack_tok(&dat,ItemType::IntegerTokens,None),
-        ItemType::MerlinTokens => fimg.pack_raw(&dat),
+        ItemType::Automatic => fimg.pack(dat,load_addr),
+        ItemType::AppleSingle => fimg.pack_apple_single(dat, load_addr),
+        ItemType::Raw => fimg.pack_raw(dat),
+        ItemType::Binary => fimg.pack_bin(dat,load_addr,None),
+        ItemType::ApplesoftTokens => fimg.pack_tok(dat,ItemType::ApplesoftTokens,None),
+        ItemType::IntegerTokens => fimg.pack_tok(dat,ItemType::IntegerTokens,None),
+        ItemType::MerlinTokens => fimg.pack_raw(dat),
         ItemType::Text => {
-            let txt = std::str::from_utf8(&dat)?;
+            let txt = std::str::from_utf8(dat)?;
             fimg.pack_txt(txt)
         },
         ItemType::Records => {
-            let json_str = std::str::from_utf8(&dat)?;
+            let json_str = std::str::from_utf8(dat)?;
             fimg.pack_rec_str(json_str)
         },
-        _ => return Err(Box::new(CommandError::UnsupportedItemType))
+        _ => Err(Box::new(CommandError::UnsupportedItemType))
     }
 }
 

src/fs/cpm/pack.rs

@@ -225,7 +225,7 @@ impl Packing for Packer {
         }
     }
 
-    fn get_load_address(&self,_fimg: &FileImage) -> u16 {
+    fn get_load_address(&self,_fimg: &FileImage) -> usize {
         0
     }