ANDROID: implemented file manager delete file operation.

Author: chrisws

src/platform/android/app/src/main/java/net/sourceforge/smallbasic/MainActivity.java

@@ -938,6 +938,25 @@ private boolean isPublicStorage(String dir) {
   private class WebServerImpl extends WebServer {
     private final Map<String, Long> fileLengths = new HashMap<>();
 
+    @Override
+    protected byte[] decodeBase64(String data) {
+      return Base64.decode(data, Base64.DEFAULT);
+    }
+
+    @Override
+    protected void deleteFile(String fileName) throws IOException {
+      if (fileName == null) {
+        throw new IOException("Empty file name");
+      }
+      File file = getFile(fileName);
+      if (file == null) {
+        throw new IOException("File not found");
+      }
+      if (!file.delete()) {
+        throw new IOException("Failed to delete file:" + fileName);
+      }
+    }
+
     @Override
     protected void execStream(InputStream inputStream) throws IOException {
       MainActivity.this.execStream(inputStream);
@@ -983,8 +1002,8 @@ protected void log(String message) {
 
     @Override
     protected void renameFile(String from, String to) throws IOException {
-      if (to == null || !to.endsWith(".bas")) {
-        throw new IOException("Invalid file name: " + to);
+      if (to == null) {
+        throw new IOException("Empty file name");
       }
       File toFile = getFile(to);
       if (toFile != null) {

src/platform/android/app/src/main/java/net/sourceforge/smallbasic/WebServer.java

@@ -1,7 +1,5 @@
 package net.sourceforge.smallbasic;
 
-import android.util.Base64;
-
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -64,9 +62,11 @@ public void run() {
     socketThread.start();
   }
 
+  protected abstract void deleteFile(String fileName) throws IOException;
   protected abstract void execStream(InputStream inputStream) throws IOException;
   protected abstract Response getFile(String path, boolean asset) throws IOException;
   protected abstract Collection<FileData> getFileData() throws IOException;
+  protected abstract byte[] decodeBase64(String data);
   protected abstract void log(String message);
   protected abstract void log(String message, Exception exception);
   protected abstract void renameFile(String from, String to) throws IOException;
@@ -100,7 +100,7 @@ private void runServer(final int socketNum, final String token) throws IOExcepti
   /**
    * Server Request base class
    */
-  public abstract static class AbstractRequest {
+  public abstract class AbstractRequest {
     final Socket socket;
     final String method;
     final String url;
@@ -267,7 +267,7 @@ public FileData(File file) {
   /**
    * Holder for POST form data
    */
-  public static class FormField {
+  public class FormField {
     private static final String BASE_64_PREFIX = ";base64,";
     private final String string;
     private final byte[] bytes;
@@ -277,7 +277,7 @@ public FormField(String key, String value) throws IOException {
       if (index != -1 && "data".equals(key)) {
         ByteArrayOutputStream data = new ByteArrayOutputStream();
         String base64Value = value.substring(index + BASE_64_PREFIX.length());
-        data.write(Base64.decode(base64Value, Base64.DEFAULT));
+        data.write(decodeBase64(base64Value));
         this.string = null;
         this.bytes = data.toByteArray();
       } else {
@@ -286,7 +286,8 @@ public FormField(String key, String value) throws IOException {
       }
     }
 
-    public String getString() {
+    @Override
+    public String toString() {
       return string;
     }
 
@@ -438,7 +439,7 @@ private Response handleDownload(Map<String, Collection<String>> data) throws IOE
      * Handler for files API
      */
     private Response handleFileList() throws IOException {
-      log("Sending file list");
+      log("Creating file list");
       JsonBuilder builder = new JsonBuilder();
       builder.append('[');
       long id = 0;
@@ -492,6 +493,8 @@ private void handlePost(Map<String, FormField> data) throws IOException {
           handleUpload(data).send(socket, null);
         } else if (url.startsWith("/api/rename")) {
           handleRename(data).send(socket, null);
+        } else if (url.startsWith("/api/delete")) {
+          handleDelete(data).send(socket, null);
         } else {
           new Response(SC_NOT_FOUND).send(socket, null);
         }
@@ -506,6 +509,22 @@ private void handlePost(Map<String, FormField> data) throws IOException {
       }
     }
 
+    /**
+     * Handler for File delete
+     */
+    private Response handleDelete(Map<String, FormField> data) throws IOException {
+      String fileName = getString(data, "fileName");
+      Response result;
+      try {
+        deleteFile(fileName);
+        log("Deleted " + fileName);
+        result = handleFileList();
+      } catch (IOException e) {
+        result = handleStatus(false, e.getMessage());
+      }
+      return result;
+    }
+
     /**
      * Handler for File rename operations
      */

src/platform/android/webui/server/src/main/java/net/sourceforge/smallbasic/Server.java

@@ -8,13 +8,15 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.FileTime;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.Collection;
 import java.util.Objects;
 
@@ -24,6 +26,16 @@ public class Server {
   public static void main(String[] args ) throws IOException {
     // ln -s ../../../../../../../../app/src/main/java/net/sourceforge/smallbasic/WebServer.java .
     WebServer webServer = new WebServer() {
+      @Override
+      protected byte[] decodeBase64(String data) {
+        return Base64.getDecoder().decode(data);
+      }
+
+      @Override
+      protected void deleteFile(String fileName) throws IOException {
+        Files.delete(Paths.get(BASIC_HOME, fileName));
+      }
+
       @Override
       protected void execStream(InputStream inputStream) {
         try {
@@ -35,6 +47,13 @@ protected void execStream(InputStream inputStream) {
         }
       }
 
+      @Override
+      protected Response getFile(String path, boolean asset) throws IOException {
+        String prefix = asset ? "../build/" : BASIC_HOME;
+        File file = new File(prefix + path);
+        return new Response(Files.newInputStream(file.toPath()), file.length());
+      }
+
       @Override
       protected Collection<FileData> getFileData() throws IOException {
         final File folder = new File(BASIC_HOME);
@@ -53,13 +72,6 @@ protected Collection<FileData> getFileData() throws IOException {
         return result;
       }
 
-      @Override
-      protected Response getFile(String path, boolean asset) throws IOException {
-        String prefix = asset ? "../build/" : BASIC_HOME;
-        File file = new File(prefix + path);
-        return new Response(Files.newInputStream(file.toPath()), file.length());
-      }
-
       @Override
       protected void log(String message) {
         System.err.println(message);
@@ -73,7 +85,7 @@ protected void log(String message, Exception exception) {
 
       @Override
       protected void renameFile(String from, String to) throws IOException {
-        if (to == null || !to.endsWith(".bas")) {
+        if (to == null) {
           throw new IOException("Invalid File Name: " + to);
         }
         File toFile = new File(BASIC_HOME, to);

src/platform/android/webui/src/App.js

@@ -9,6 +9,11 @@ import {
   Box,
   Button,
   CssBaseline,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogContentText,
+  DialogTitle,
   Link,
   Snackbar,
   TextField,
@@ -26,6 +31,7 @@ import {
 } from '@mui/x-data-grid';
 
 import {
+  Delete as DeleteIcon,
   Download as DownloadIcon,
   Upload as UploadIcon
 } from '@mui/icons-material';
@@ -96,6 +102,11 @@ function renameFile(from, to, success, fail) {
   callApi('/api/rename', body, success, fail);
 }
 
+function deleteFile(fileName, success, fail) {
+  let body = "fileName=" + encodeURIComponent(fileName);
+  callApi('/api/delete', body, success, fail);
+}
+
 function copyFiles(event, success, progress, fail) {
   const fileReader = new FileReader();
   const input = event.target;
@@ -116,6 +127,68 @@ function copyFiles(event, success, progress, fail) {
   fileReader.readAsDataURL(files[index]);
 }
 
+function ConfirmDeleteDialog(props) {
+  return (
+    <div>
+      <Dialog
+        open={props.open}
+        onClose={props.handleClose}
+        aria-labelledby="alert-dialog-title"
+        aria-describedby="alert-dialog-description">
+        <DialogTitle id="alert-dialog-title">
+          {"Delete file"}
+        </DialogTitle>
+        <DialogContent>
+          <DialogContentText id="alert-dialog-description">
+            Are you sure you want to permanently delete {props.name}? You cannot undo this.
+          </DialogContentText>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={props.handleClose}>Cancel</Button>
+          <Button onClick={props.handleDelete} autoFocus>
+            Delete
+          </Button>
+        </DialogActions>
+      </Dialog>
+    </div>
+  );
+}
+
+function GridToolbarDelete(props) {
+  const [error, setError] = useState(null);
+  const [open, setOpen] = useState(false);
+
+  const showPrompt = () => {
+    setOpen(true);
+  };
+
+  const handleClose = () => {
+    setOpen(false);
+  };
+
+  const handleDelete = () => {
+    setOpen(false);
+    deleteFile(props.rows[props.selections[0]].fileName, (data) => {
+      props.setRows(data);
+      props.setSelections([]);
+    }, (error) => {
+      setError(error);
+      setError(true);
+    });
+  };
+
+  return props.selections.length !== 1 ? null : (
+    <Fragment>
+      <ConfirmDeleteDialog open={open} name={props.rows[props.selections[0]].fileName} handleClose={handleClose} handleDelete={handleDelete}/>
+      <ErrorMessage error={error} setError={setError} severity="error"/>
+      <Button color="primary" size="small" component="label" sx={{marginLeft: '-4px'}} onClick={showPrompt}>
+        <DeleteIcon />
+        DELETE
+      </Button>
+    </Fragment>
+  );
+}
+
 function GridToolbarDownload(props) {
   let color = useTheme().palette.primary.main;
   let args = "";
@@ -203,6 +276,7 @@ function AppToolbar(props) {
       <GridToolbarDensitySelector />
       <GridToolbarUpload {...props}/>
       <GridToolbarDownload {...props}/>
+      <GridToolbarDelete {...props}/>
     </GridToolbarContainer>
   );
 }
@@ -227,6 +301,7 @@ function FileList(props) {
 
   const toolbarProps = {
     selections: selectionModel,
+    setSelections: setSelectionModel,
     setRows: props.setRows,
     rows: props.rows
   };