ANDROID: file manager webui (wip)

Author: chrisws

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

@@ -943,17 +943,29 @@ protected Collection<FileData> getFileData() throws IOException {
     }
 
     @Override
-    protected Response getResponse(String path, boolean asset) throws IOException {
-      String name = "webui/" + path;
-      AssetFileDescriptor fd = getAssets().openFd(name);
-      return new Response(getAssets().open(name), fd.getLength());
+    protected Response getFile(String path, boolean asset) throws IOException {
+      Response result;
+      if (asset) {
+        String name = "webui/" + path;
+        AssetFileDescriptor fd = getAssets().openFd(name);
+        result = new Response(getAssets().open(name), fd.getLength());
+      }
+      else {
+        result = null;
+      }
+      return result;
     }
 
     @Override
     protected void log(String message, Exception exception) {
       Log.i(TAG, message, exception);
     }
 
+    @Override
+    protected boolean renameFile(String from, String to) {
+      return false;
+    }
+
     @Override
     protected void log(String message) {
       Log.i(TAG, message);

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

@@ -53,24 +53,25 @@ public void run() {
 
   protected abstract void execStream(InputStream inputStream) throws IOException;
   protected abstract Collection<FileData> getFileData() throws IOException;
-  protected abstract Response getResponse(String path, boolean asset) throws IOException;
-  protected abstract void log(String message, Exception exception);
+  protected abstract Response getFile(String path, boolean asset) throws IOException;
   protected abstract void log(String message);
+  protected abstract void log(String message, Exception exception);
+  protected abstract boolean renameFile(String from, String to);
   protected abstract boolean saveFile(String fileName, String content);
 
   /**
    * Download files button handler
    */
-  private Response handleDownload(Map<String, Collection<String>> parameters) throws IOException {
-    Collection<String> fileNames = parameters.get("f");
+  private Response handleDownload(Map<String, Collection<String>> data) throws IOException {
+    Collection<String> fileNames = data.get("f");
     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
     ZipOutputStream zipOutputStream = new ZipOutputStream(outputStream);
     if (fileNames == null) {
       fileNames = Collections.emptyList();
     }
 
     for (String fileName : fileNames) {
-      Response response = getResponse(fileName, false);
+      Response response = getFile(fileName, false);
       ZipEntry entry = new ZipEntry(fileName);
       zipOutputStream.putNextEntry(entry);
       response.toStream(zipOutputStream);
@@ -106,6 +107,16 @@ private Response handleFileList() throws IOException {
     return new Response(new ByteArrayInputStream(json), json.length);
   }
 
+  /**
+   * Handler for File rename operations
+   */
+  private Response handleRename(Map<String, String> data) throws IOException {
+    String from = data.get("from");
+    String to = data.get("to");
+    boolean result = renameFile(from, to);
+    return handleStatus(result, result ? "File renamed" : "File rename error");
+  }
+
   /**
    * Handler to indicate operational status
    */
@@ -124,9 +135,9 @@ private Response handleStatus(boolean success, String message) throws IOExceptio
   /**
    * Handler for file uploads
    */
-  private Response handleUpload(Map<String, String> parameters) throws IOException {
-    String fileName = parameters.get("fileName");
-    String content = parameters.get("data");
+  private Response handleUpload(Map<String, String> data) throws IOException {
+    String fileName = data.get("fileName");
+    String content = data.get("data");
     boolean result = saveFile(fileName, content);
     return handleStatus(result, result ? "File saved" : "File save error");
   }
@@ -143,7 +154,7 @@ private Response handleWebResponse(String asset) throws IOException {
     } else {
       path = asset;
     }
-    return getResponse(path, true);
+    return getFile(path, true);
   }
 
   /**
@@ -414,6 +425,8 @@ private void handlePost(Map<String, String> data, String tokenKey) throws IOExce
           handleFileList().send(socket, userToken);
         } else if (url.startsWith("/api/upload")) {
           handleUpload(data).send(socket, null);
+        } else if (url.startsWith("/api/rename")) {
+          handleRename(data).send(socket, null);
         }
         log("Sent POST response");
       } else {

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

@@ -1,11 +1,8 @@
 package net.sourceforge.smallbasic;
 
 import sun.misc.IOUtils;
-import sun.rmi.runtime.Log;
 
-import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -62,14 +59,20 @@ protected void log(String message) {
       }
 
       @Override
-      protected boolean saveFile(String fileName, String content) {
+      protected void log(String message, Exception exception) {
+        System.err.println(message);
+        exception.printStackTrace();
+      }
+
+      @Override
+      protected boolean renameFile(String from, String to) {
+        log("rename " + from + " to " + to);
         return true;
       }
 
       @Override
-      protected void log(String message, Exception exception) {
-        System.err.println(message);
-        exception.printStackTrace();
+      protected boolean saveFile(String fileName, String content) {
+        return true;
       }
     };
     webServer.run(8080, "ABC123");

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

@@ -32,6 +32,11 @@ import {
 const columns = [{
   field: 'fileName',
   headerName: 'Name',
+  editable: true,
+  preProcessEditCellProps: (params) => {
+    const hasError = !params.props.value.endsWith(".bas");
+    return {...params.props, error: hasError};
+  } ,
   flex: 1,
 }, {
   field: 'size',
@@ -41,22 +46,6 @@ const columns = [{
   field: 'date',
   headerName: 'Modified',
   type: 'number',
-}, {
-  field: 'actions',
-  type: 'actions',
-  headerName: 'Actions',
-  cellClassName: 'actions',
-  getActions: ({ id }) => {
-    return [
-      <Button
-        variant="contained"
-        size="small"
-        style={{marginLeft: 16}}
-        tabIndex={-1}>
-        Run
-      </Button>
-    ];
-  },
 }];
 
 function getFetchHeader(body) {
@@ -67,28 +56,35 @@ function getFetchHeader(body) {
   };
 }
 
-function getFiles(token, success, fail) {
-  fetch('/api/files', getFetchHeader("token=" + token))
-    .then(response => response.json())
-    .then(success)
-    .catch(fail);
-}
-
-function upload(name, data, success, fail) {
-  let body = "fileName=" + encodeURIComponent(name) + "&data=" + encodeURIComponent(data);
-  fetch('/api/upload', getFetchHeader(body))
+function fetchApi(api, body, success, fail) {
+  fetch(api, getFetchHeader(body))
     .then(response => response.json())
     .then((response) => {
       if (response.error) {
         fail(response.error);
       } else {
-        success();
+        success(response);
       }
     })
     .catch(fail);
 }
 
-function copyFiles(event, token, success, fail) {
+function getFiles(token, success, fail) {
+  let body = token ? ("token=" + token) : "";
+  fetchApi('/api/files', body, success, fail);
+}
+
+function upload(name, data, success, fail) {
+  let body = "fileName=" + encodeURIComponent(name) + "&data=" + encodeURIComponent(data);
+  fetchApi('/api/upload', body, success, fail);
+}
+
+function renameFile(from, to, success, fail) {
+  let body = "from=" + encodeURIComponent(from) + "&to=" + encodeURIComponent(to);
+  fetchApi('/api/rename', body, success, fail);
+}
+
+function copyFiles(event, success, fail) {
   const fileReader = new FileReader();
   const input = event.target;
   const files = input.files;
@@ -98,7 +94,7 @@ function copyFiles(event, token, success, fail) {
       if (++index < files.length) {
         fileReader.readAsText(files[index]);
       } else {
-        getFiles(token, success, fail);
+        getFiles(null, success, fail);
         // reset input control
         input.value = input.defaultValue;
       }
@@ -131,7 +127,7 @@ function GridToolbarDownload(props) {
 
 function GridToolbarUpload(props) {
   const handleUpload = (event) => {
-    copyFiles(event, props.token, (newRows) => {
+    copyFiles(event, (newRows) => {
       props.setRows(newRows);
     }, (error) => {
       // show toast message
@@ -159,19 +155,35 @@ function AppToolbar(props) {
   );
 }
 
+function onCellEditCommit(props, params) {
+  props.rows.forEach((row) => {
+    if (row.id === params.id) {
+      renameFile(row.fileName, params.value, () => {
+        getFiles(null, (data) => {
+          props.setRows(data);
+        }, (error) => {
+          console.log(error);
+        });
+      }, (error) => {
+        console.log(error);
+      });
+    }
+  });
+};
+
 function FileList(props) {
   const [selectionModel, setSelectionModel] = useState([]);
 
   const toolbarProps = {
     selections: selectionModel,
     setRows: props.setRows,
-    rows: props.rows,
-    token: props.token,
+    rows: props.rows
   };
 
   return (
     <DataGrid rows={props.rows}
               columns={columns}
+              onCellEditCommit={(params) => onCellEditCommit(props, params)}
               pageSize={5}
               components={{Toolbar: AppToolbar}}
               componentsProps={{toolbar: toolbarProps}}
@@ -239,7 +251,7 @@ export default function App() {
 
   let content;
   if (token) {
-    content = <FileList setRows={setRows} rows={rows} token={token} />;
+    content = <FileList setRows={setRows} rows={rows} />;
   } else {
     content = <TokenInput setRows={setRows} setToken={setToken} token={token}/>;
   }