MX 1 год назад
Родитель
Сommit
45e8fa39cf
4 измененных файлов с 18 добавлено и 10 удалено
  1. 1 1
      application.fam
  2. 12 8
      scenes/wifi_marauder_scene_console_output.c
  3. 4 0
      wifi_marauder_app.c
  4. 1 1
      wifi_marauder_app.h

+ 1 - 1
application.fam

@@ -1,7 +1,7 @@
 App(
     appid="esp32_wifi_marauder",
     name="[ESP32] WiFi Marauder",
-    fap_version=(7, 0),
+    fap_version=(7, 1),
     apptype=FlipperAppType.EXTERNAL,
     entry_point="wifi_marauder_app",
     requires=["gui"],

+ 12 - 8
scenes/wifi_marauder_scene_console_output.c

@@ -131,15 +131,19 @@ void wifi_marauder_scene_console_output_on_enter(void* context) {
         // Create files *before* sending command
         // (it takes time to iterate through the directory)
         if(app->ok_to_save_logs) {
-            strcpy(
-                app->log_file_path,
-                sequential_file_resolve_path(
-                    app->storage, MARAUDER_APP_FOLDER_LOGS, prefix, "log"));
-            if(storage_file_open(
-                   app->log_file, app->log_file_path, FSAM_WRITE, FSOM_CREATE_ALWAYS)) {
-                app->is_writing_log = true;
+            char* resolved_path = sequential_file_resolve_path(
+                app->storage, MARAUDER_APP_FOLDER_LOGS, prefix, "log");
+            if(resolved_path != NULL) {
+                strcpy(app->log_file_path, resolved_path);
+                free(resolved_path);
+                if(storage_file_open(
+                       app->log_file, app->log_file_path, FSAM_WRITE, FSOM_CREATE_ALWAYS)) {
+                    app->is_writing_log = true;
+                } else {
+                    dialog_message_show_storage_error(app->dialogs, "Cannot open log file");
+                }
             } else {
-                dialog_message_show_storage_error(app->dialogs, "Cannot open log file");
+                dialog_message_show_storage_error(app->dialogs, "Cannot resolve log path");
             }
         }
 

+ 4 - 0
wifi_marauder_app.c

@@ -114,6 +114,10 @@ void wifi_marauder_make_app_folder(WifiMarauderApp* app) {
     if(!storage_simply_mkdir(app->storage, MARAUDER_APP_FOLDER_SCRIPTS)) {
         dialog_message_show_storage_error(app->dialogs, "Cannot create\nscripts folder");
     }
+
+    if(!storage_simply_mkdir(app->storage, MARAUDER_APP_FOLDER_HTML)) {
+        dialog_message_show_storage_error(app->dialogs, "Cannot create\nhtml folder");
+    }
 }
 
 void wifi_marauder_load_settings(WifiMarauderApp* app) {

+ 1 - 1
wifi_marauder_app.h

@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#define WIFI_MARAUDER_APP_VERSION "v0.7.0"
+#define WIFI_MARAUDER_APP_VERSION "v0.7.1"
 
 typedef struct WifiMarauderApp WifiMarauderApp;