jblanked пре 1 година
родитељ
комит
e955c2c821
2 измењених фајлова са 17 додато и 1 уклоњено
  1. 15 1
      flipper_http/flipper_http.c
  2. 2 0
      flipper_http/flipper_http.h

+ 15 - 1
flipper_http/flipper_http.c

@@ -15,6 +15,17 @@ bool flipper_http_append_to_file(
 
     if (start_new_file)
     {
+        // Delete the file if it already exists
+        if (storage_file_exists(storage, file_path))
+        {
+            if (!storage_simply_remove_recursive(storage, file_path))
+            {
+                FURI_LOG_E(HTTP_TAG, "Failed to delete file: %s", file_path);
+                storage_file_free(file);
+                furi_record_close(RECORD_STORAGE);
+                return false;
+            }
+        }
         // Open the file in write mode
         if (!storage_file_open(file, file_path, FSAM_WRITE, FSOM_CREATE_ALWAYS))
         {
@@ -181,12 +192,13 @@ int32_t flipper_http_worker(void *context)
                         if (!flipper_http_append_to_file(
                                 file_buffer,
                                 file_buffer_len,
-                                !fhttp.just_started_get && !fhttp.just_started_post,
+                                fhttp.just_started_bytes,
                                 fhttp.file_path))
                         {
                             FURI_LOG_E(HTTP_TAG, "Failed to append data to file");
                         }
                         file_buffer_len = 0;
+                        fhttp.just_started_bytes = false;
                     }
                 }
 
@@ -1294,6 +1306,7 @@ void flipper_http_rx_callback(const char *line, void *context)
         fhttp.state = RECEIVING;
         // for GET request, save data only if it's a bytes request
         fhttp.save_bytes = fhttp.is_bytes_request;
+        fhttp.just_started_bytes = true;
         return;
     }
     else if (strstr(line, "[POST/SUCCESS]") != NULL)
@@ -1304,6 +1317,7 @@ void flipper_http_rx_callback(const char *line, void *context)
         fhttp.state = RECEIVING;
         // for POST request, save data only if it's a bytes request
         fhttp.save_bytes = fhttp.is_bytes_request;
+        fhttp.just_started_bytes = true;
         return;
     }
     else if (strstr(line, "[PUT/SUCCESS]") != NULL)

+ 2 - 0
flipper_http/flipper_http.h

@@ -76,6 +76,8 @@ typedef struct
     bool is_bytes_request;     // Flag to indicate if the request is for bytes
     bool save_bytes;           // Flag to save the received data to a file
     bool save_received_data;   // Flag to save the received data to a file
+
+    bool just_started_bytes; // Indicates if bytes data reception has just started
 } FlipperHTTP;
 
 extern FlipperHTTP fhttp;