From c16e0677df53fee275681a80ed7ea225517efa64 Mon Sep 17 00:00:00 2001
From: nino-porcino <nino.porcino@gmail.com>
Date: Fri, 11 Feb 2022 12:50:28 +0100
Subject: [PATCH] improve DIR, implement DEL

---
 demos/sdcard/apple1_sdcard/apple1_sdcard.ino | 97 +++++++++++++++++---
 demos/sdcard/cmd_del.h                       | 12 +++
 demos/sdcard/console.h                       | 13 ++-
 3 files changed, 107 insertions(+), 15 deletions(-)
 create mode 100644 demos/sdcard/cmd_del.h

diff --git a/demos/sdcard/apple1_sdcard/apple1_sdcard.ino b/demos/sdcard/apple1_sdcard/apple1_sdcard.ino
index 522ae84..8b69a00 100644
--- a/demos/sdcard/apple1_sdcard/apple1_sdcard.ino
+++ b/demos/sdcard/apple1_sdcard/apple1_sdcard.ino
@@ -1,4 +1,3 @@
-
 #include <Regexp.h>
 #include <SPI.h>
 #include "SdFat.h"
@@ -196,9 +195,10 @@ void setup() {
   }
 }
 
-const int CMD_READ  = 0;
-const int CMD_WRITE = 1;
-const int CMD_DIR   = 2;
+const int CMD_READ  =  0;
+const int CMD_WRITE =  1;
+const int CMD_DIR   =  2;
+const int CMD_DEL   = 11;
 
 const int ERR_RESPONSE = 255;
 const int OK_RESPONSE  =   0;
@@ -306,7 +306,7 @@ void comando_dir() {
   Serial.println(F("command DIR ended"));
 }
 
-void print_dir_entry(File dir, int what) {
+void print_dir_entry(File dir, int list_files) {
   while (true) {    
     File entry = dir.openNextFile();
 
@@ -318,20 +318,24 @@ void print_dir_entry(File dir, int what) {
     // send file size or directory
     entry.getName(filename, 64);
     
-    if((what == 0 && entry.isDirectory()) || (what == 1 && !entry.isDirectory())) {
+    if((list_files == 0 && entry.isDirectory()) || (list_files == 1 && !entry.isDirectory())) {
       if(entry.isDirectory()) {
         sprintf(tmp, "(DIR) %s\r", filename);
+        print_string_to_cpu(tmp);
+        Serial.println(tmp);                       
       }
       else {
-        sprintf(tmp, "%5d %s\r", entry.size(), filename);
+        // BUG the following line does not work
+        // sprintf(tmp, "%5d %s", entry.size(), filename);        
+        // use this instead
+        sprintf(tmp, "%5d ", entry.size());
+        print_string_to_cpu(tmp);
+        Serial.print(tmp);       
+        print_string_to_cpu(filename);                
+        send_byte_to_cpu('\r');
+        Serial.println(filename);               
       }      
-      for(int t=0;t<strlen(tmp);t++) {
-        send_byte_to_cpu(tmp[t]);
-        if(TIMEOUT) break;
-      }
-      if(TIMEOUT) break;
-      
-      Serial.println(tmp);               
+      if(TIMEOUT) break;          
     }
     entry.close();
   }
@@ -408,6 +412,17 @@ void send_string_to_cpu(char *msg) {
   }
 }
 
+// come send_string_to_cpu ma senza lo zero finale
+void print_string_to_cpu(char *msg) {
+  while(1) {
+    int c = *msg++;
+    if(c==0) break;
+    send_byte_to_cpu(c);
+    if(TIMEOUT) break;    
+  }
+}
+
+
 void receive_string_from_cpu(char *msg) {
   while(1) {
     int c = receive_byte_from_cpu();
@@ -493,6 +508,56 @@ void comando_write() {
   send_byte_to_cpu(OK_RESPONSE);
 }
 
+// **************************************************************************************
+// **************************************************************************************
+// ********************************* CMD_DEL ********************************************
+// **************************************************************************************
+// **************************************************************************************
+
+void comando_del() {
+  Serial.println(F("command DEL received from CPU"));
+
+  // reads filename as 0 terminated string
+  receive_string_from_cpu(filename);
+  if(TIMEOUT) return;
+  Serial.print(F("file to delete: "));
+  Serial.println(filename);
+  
+  if(!SD.exists(filename)) {
+    Serial.println(F("file does not exist"));
+    send_string_to_cpu((char *)F("?FILE NOT FOUND"));
+    return;    
+  }
+
+  if(TIMEOUT) return;
+
+  // open the file for deletion
+  File myFile = SD.open(filename, FILE_WRITE);
+  if(!myFile) {            
+    Serial.println(F("error opening file for deletion"));    
+    send_string_to_cpu((char *)F("?CAN'T DELETE FILE"));
+    myFile.close();
+    return;
+  }  
+
+  if(TIMEOUT) return;
+    
+  if(!myFile.remove()) {
+    Serial.println(F("error removing file"));
+    send_string_to_cpu((char *)F("?CAN'T DELETE FILE"));      
+    myFile.close();
+    return;
+  }
+
+  // close the file
+  myFile.close();
+
+  print_string_to_cpu(filename);  
+  send_string_to_cpu((char *)F(" DELETED")); 
+
+  Serial.println(F("file deleted"));       
+}
+
 // **************************************************************************************
 // **************************************************************************************
 // ********************************* LOOP  **********************************************
@@ -516,6 +581,10 @@ void loop() {
   else if(data == CMD_DIR) {
     comando_dir();
     if(TIMEOUT) Serial.println(F("TIMEOUT during DIR"));    
+  }  
+  else if(data == CMD_DEL) {
+    comando_del();
+    if(TIMEOUT) Serial.println(F("TIMEOUT during DEL"));    
   }
   else {
     Serial.print(F("unknown command "));
diff --git a/demos/sdcard/cmd_del.h b/demos/sdcard/cmd_del.h
new file mode 100644
index 0000000..1dc4b5e
--- /dev/null
+++ b/demos/sdcard/cmd_del.h
@@ -0,0 +1,12 @@
+void comando_del() {
+   // send command byte
+   send_byte_to_MCU(CMD_DEL);
+   if(TIMEOUT) return;
+
+   // send filename
+   send_string_to_MCU(filename);
+   if(TIMEOUT) return;
+
+   print_string_response();
+   return;
+}
diff --git a/demos/sdcard/console.h b/demos/sdcard/console.h
index 55ce3a3..ab3414d 100644
--- a/demos/sdcard/console.h
+++ b/demos/sdcard/console.h
@@ -29,7 +29,8 @@ const byte CMD_TYPE  =  7;
 const byte CMD_DUMP  =  8;
 const byte CMD_JMP   =  9;
 const byte CMD_BAS   = 10;
-const byte CMD_EXIT  = 11;
+const byte CMD_DEL   = 11;
+const byte CMD_EXIT  = 12;
 
 // the list of recognized commands
 byte *DOS_COMMANDS[] = {
@@ -44,6 +45,7 @@ byte *DOS_COMMANDS[] = {
    "DUMP",
    "JMP",
    "BAS",
+   "DEL",
    "EXIT"
 };
 
@@ -117,6 +119,7 @@ void hex_to_word(byte *str) {
 #include "cmd_type.h"
 #include "cmd_dump.h"
 #include "cmd_dir.h"
+#include "cmd_del.h"
 
 void console() {   
 
@@ -268,6 +271,14 @@ void console() {
          woz_puts("BAS ");
          bas_info();
       }
+      else if(cmd == CMD_DEL) {
+         get_token(filename, 32);  // parse filename
+         if(filename[0] == 0) {
+            woz_puts("?MISSING FILENAME");
+            continue;
+         }
+         comando_del();
+      }
       else if(cmd == CMD_EXIT) {
          woz_puts("BYE\r");
          woz_mon();