[basm] Fix file saving in DSK rm etch4k.dsk ; cargo install --path=. …

…&& basm ~/Perso/CPC/Sandbox/etchasketch/etch4k.asm && basm ~/Perso/CPC/Sandbox/etchasketch/etch4k.asm --backup!
cpcsdk · Jan 5, 2024 · 62442bc · 62442bc
1 parent 4a7c578
commit 62442bc
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/cpclib-basm/src/lib.rs b/cpclib-basm/src/lib.rs
@@ -199,7 +199,10 @@ pub fn assemble<'arg>(
     assemble_options.set_case_sensitive(!matches.get_flag("CASE_INSENSITIVE"));
     if matches.get_flag("OVERRIDE") {
         assemble_options.set_save_behavior(cpclib_disc::amsdos::AmsdosAddBehavior::ReplaceAndEraseIfPresent);
-    } else {
+    } else if matches.get_flag("BACKUP") {
+        assemble_options.set_save_behavior(cpclib_disc::amsdos::AmsdosAddBehavior::BackupIfPresent);
+    }
+    else {
         assemble_options.set_save_behavior(cpclib_disc::amsdos::AmsdosAddBehavior::FailIfPresent);
     }
 
@@ -659,6 +662,13 @@ pub fn build_args_parser() -> clap::Command {
                         .long("override")
                         .action(ArgAction::SetTrue)
                     )
+                    .arg(
+                        Arg::new("BACKUP")
+                            .help("Backup an existing file when saved on disc")
+                            .long("backup")
+                            .conflicts_with("OVERRIDE")
+                            .action(ArgAction::SetTrue)
+                    )
                     ;
 
     let cmd = if cfg!(feature = "xferlib") {

diff --git a/cpclib-disc/src/amsdos.rs b/cpclib-disc/src/amsdos.rs
@@ -1099,7 +1099,17 @@ impl<'dsk, 'mng: 'dsk, D: Disc> AmsdosManagerMut<'dsk, D> {
                     self.erase_file(filename, false)?;
                 },
                 AmsdosAddBehavior::BackupIfPresent => {
-                    todo!("Rename the current file and remove other files with new name");
+                    let mut backup_fname = filename.clone();
+                    backup_fname.set_extension("BAK");
+
+                    if self.entries_for(backup_fname).is_some() {
+                        self.erase_file(backup_fname, true)?;
+                    }
+                    assert!(self.get_file(backup_fname).is_none());
+                    self.rename(filename, backup_fname)?;
+                    assert!(self.get_file(filename).is_none());
+                    assert!(self.get_file(backup_fname).is_some());
+
                 },
                 AmsdosAddBehavior::ReplaceAndEraseIfPresent => {
                     self.erase_file(filename, true)?;
@@ -1237,6 +1247,19 @@ impl<'dsk, 'mng: 'dsk, D: Disc> AmsdosManagerMut<'dsk, D> {
         Ok(())
     }
 
+    pub fn rename(&mut self, source: AmsdosFileName, destination: AmsdosFileName) -> Result<(), AmsdosError> {
+        match self.entries_for(source) {
+            Some(entries) => {
+                entries.into_iter()
+                    .for_each(|mut e| {
+                        e.file_name = destination;
+                        self.update_entry(&e);
+                    });
+                    Ok(())
+            },
+            None => Err(AmsdosError::FileDoesNotExist(format!("{:?}", source))),
+        }
+    }
 
     pub fn catalog<'mngr: 'dsk>(&'dsk self) -> AmsdosEntries {
         let nonmut: AmsdosManagerNonMut<'dsk, D> = self.into();