added file manager, upload animation, unsaved config indicator

rust/src/webserver/webserver.rs

@@ -5,7 +5,7 @@ use std::{
     sync::{atomic::AtomicBool, Arc},
 };
 use crate::{
-    espota::OtaUpdate, get_version, map_range_moisture, plant_hal::FileInfo, BOARD_ACCESS,
+    espota::OtaUpdate, get_version, map_range_moisture, plant_hal::{FileInfo, PLANT_COUNT}, BOARD_ACCESS,
 };
 use anyhow::bail;
 use chrono::DateTime;
@@ -159,6 +159,7 @@ fn get_battery_state(
 fn get_version_web(
     _request: &mut Request<&mut EspHttpConnection>,
 ) -> Result<Option<std::string::String>, anyhow::Error> {
+    
     anyhow::Ok(Some(serde_json::to_string(&get_version())?))
 }
 
@@ -197,19 +198,30 @@ fn list_files(
 fn ota(
     request: &mut Request<&mut EspHttpConnection>,
 ) -> Result<Option<std::string::String>, anyhow::Error> {
+    let mut board = BOARD_ACCESS.lock().unwrap();
     let mut ota = OtaUpdate::begin()?;
     println!("start ota");
-
+   
     //having a larger buffer is not really faster, requires more stack and prevents the progress bar from working ;)
     const BUFFER_SIZE: usize = 512;
     let mut buffer: [u8; BUFFER_SIZE] = [0; BUFFER_SIZE];
     let mut total_read: usize = 0;
+    let mut lastiter = 0;
     loop {
         let read = request.read(&mut buffer)?;
         total_read += read;
         println!("received {read} bytes ota {total_read}");
         let to_write = &buffer[0..read];
 
+        let iter = (total_read/1024)%8;
+        if iter != lastiter {
+            for i in 0..PLANT_COUNT {
+                board.fault(i, iter==i);
+                
+            }
+            lastiter = iter;
+        }  
+
         ota.write(to_write)?;
         println!("wrote {read} bytes ota {total_read}");
         if read == 0 {
@@ -222,6 +234,8 @@ fn ota(
 
     let mut finalizer = ota.finalize()?;
     println!("changing boot partition");
+    board.set_restart_to_conf(true);
+    drop(board);
     finalizer.set_as_boot_partition()?;
     finalizer.restart();
 }
@@ -413,10 +427,11 @@ pub fn httpd(reboot_now: Arc<AtomicBool>) -> Box<EspHttpServer<'static>> {
     server
         .fn_handler("/file", Method::Post, move |mut request| {
             let filename = query_param(request.uri(), "filename").unwrap();
-            let file_handle = BOARD_ACCESS
-                .lock()
-                .unwrap()
-                .get_file_handle(&filename, true);
+            let lock = BOARD_ACCESS
+            .lock()
+            .unwrap();
+            let file_handle = 
+            lock.get_file_handle(&filename, true);
             match file_handle {
                 //TODO get free filesystem size, check against during write if not to large
 
@@ -424,13 +439,21 @@ pub fn httpd(reboot_now: Arc<AtomicBool>) -> Box<EspHttpServer<'static>> {
                     const BUFFER_SIZE: usize = 512;
                     let mut buffer: [u8; BUFFER_SIZE] = [0; BUFFER_SIZE];
                     let mut total_read: usize = 0;
+                    let mut lastiter = 0;
                     loop {
+
+                        let iter = (total_read/1024)%8;
+                        if iter != lastiter {
+                            for i in 0..PLANT_COUNT {
+                                lock.fault(i, iter==i);
+                            }
+                            lastiter = iter;
+                        }                       
+
                         let read = request.read(&mut buffer)?;
                         total_read += read;
-                        println!("sending {read} bytes of {total_read} for upload {filename}");
                         let to_write = &buffer[0..read];
                         std::io::Write::write(&mut file_handle, to_write)?;
-                        println!("wrote {read} bytes of {total_read} for upload {filename}");
                         if read == 0 {
                             break;
                         }
@@ -444,6 +467,7 @@ pub fn httpd(reboot_now: Arc<AtomicBool>) -> Box<EspHttpServer<'static>> {
                     cors_response(request, 500, &error_text)?;
                 }
             }
+            drop(lock);
             anyhow::Ok(())
         })
         .unwrap();
@@ -466,6 +490,11 @@ pub fn httpd(reboot_now: Arc<AtomicBool>) -> Box<EspHttpServer<'static>> {
             anyhow::Ok(())
         })
         .unwrap();
+    server
+        .fn_handler("/file", Method::Options, |request| {
+            cors_response(request, 200, "")
+        })
+        .unwrap();
 
     server
         .fn_handler("/flashbattery", Method::Post, move |request| {
@@ -529,6 +558,7 @@ fn cors_response(
     let headers = [
         ("Access-Control-Allow-Origin", "*"),
         ("Access-Control-Allow-Headers", "*"),
+        ("Access-Control-Allow-Methods", "*"),
     ];
     let mut response = request.into_response(status, None, &headers)?;
     response.write(body.as_bytes())?;