Merge pull request #58 from acegoal07/dev

acegoal07 · web-flow · commit 46bfac49748d · 2025-08-29T21:16:32.000+01:00
Dev
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ The idea behind this app is to allow for you to test multiple copies of NFC's at
 ## How it works:
 When starting the app you are greeted by a select file option where you choose the playlist you wanna run.
 
-All playlists should be placed in `ext/apps_data/nfc_playlist`, but they can also be stored in other file locations. An example of the data format is shown below, and you can find an example file in the repository: [file](./playlist.txt). You are able to create your own playlists using the playlist editor in the app.
+All playlists should be placed in `ext/apps_data/playlists/nfc_playlist`, but they can also be stored in other file locations. An example of the data format is shown below, and you can find an example file in the repository: [file](./playlist.txt). You are able to create your own playlists using the playlist editor in the app.
 ```txt
 /ext/nfc/link.nfc
 /ext/nfc/link2.nfc
@@ -24,9 +24,12 @@ As i know these firmwares are supported and working if you know any more please
 - Skip errors (Makes it so you can make the emulation screen hide errors and skip delays between errors and emulation)
 - Loop (Makes it so the playlist will loop back to the start when it reaches the end)
 - User controls (Allows you to control the position of the playlist using the buttons on the flipper skipping and rewinding the playlist)
-- Reset settings (Puts all the settings back to the defaults)
+- Back to defaults (Resets all settings to their default values)
+- Save settings (Saves the current settings so they persist after reopening the app)
+- Reload settings (Reloads the settings from the saved configuration)
+- Delete settings (Deletes the saved settings)
 ## Playlist editor:
-- Create PLaylist (Creates a new playlist with the given name)
+- Create playlist (Creates a new playlist with the given name)
 - Delete playlist (Deletes the selected playlist)
 - Rename playlist (Renames the selected playlist to the new name provided)
 - Add NFC Item (Adds the selected nfc item to the currently selected playlist)
diff --git a/application.fam b/application.fam
@@ -7,7 +7,7 @@ App(
     fap_category="NFC",
     fap_author="@acegoal07",
     fap_weburl="https://github.com/acegoal07/FlipperZero_NFC_Playlist/tree/main",
-    fap_version="3.2",
+    fap_version="3.3",
     fap_icon_assets="assets",
     fap_icon="assets/Playlist_10px.png",
     fap_description="A Tool used to running through a list of NFC cards",
diff --git a/nfc_playlist.c b/nfc_playlist.c
@@ -18,6 +18,113 @@ static void nfc_playlist_tick_event_callback(void* context) {
    scene_manager_handle_tick_event(nfc_playlist->scene_manager);
 }
 
+void nfc_playlist_load_settings(void* context) {
+   furi_assert(context);
+   NfcPlaylist* nfc_playlist = context;
+
+   nfc_playlist->worker_info.settings->emulate_timeout = default_emulate_timeout;
+   nfc_playlist->worker_info.settings->emulate_delay = default_emulate_delay;
+   nfc_playlist->worker_info.settings->emulate_led_indicator = default_emulate_led_indicator;
+   nfc_playlist->worker_info.settings->skip_error = default_skip_error;
+   nfc_playlist->worker_info.settings->loop = default_loop;
+   nfc_playlist->worker_info.settings->user_controls = default_user_controls;
+
+   Storage* storage = furi_record_open(RECORD_STORAGE);
+
+   if(storage_file_exists(storage, SETTINGS_LOCATION)) {
+      Stream* stream = file_stream_alloc(storage);
+
+      if(file_stream_open(stream, SETTINGS_LOCATION, FSAM_READ, FSOM_OPEN_EXISTING)) {
+         FuriString* line = furi_string_alloc();
+         FuriString* key = furi_string_alloc();
+         FuriString* value = furi_string_alloc();
+
+         while(stream_read_line(stream, line)) {
+            if(furi_string_empty(line) || furi_string_start_with_str(line, "#")) continue;
+
+            size_t equal_index = furi_string_search_char(line, '=');
+            if(equal_index <= 0) continue;
+
+            furi_string_set_strn(key, furi_string_get_cstr(line), equal_index);
+            furi_string_set_str(value, furi_string_get_cstr(line) + equal_index + 1);
+
+            furi_string_trim(key);
+            furi_string_trim(value);
+
+            const char* k = furi_string_get_cstr(key);
+            const char* v = furi_string_get_cstr(value);
+
+            if(strcmp(k, "emulate_timeout") == 0) {
+               nfc_playlist->worker_info.settings->emulate_timeout = atoi(v);
+            } else if(strcmp(k, "emulate_delay") == 0) {
+               nfc_playlist->worker_info.settings->emulate_delay = atoi(v);
+            } else if(strcmp(k, "emulate_led_indicator") == 0) {
+               nfc_playlist->worker_info.settings->emulate_led_indicator =
+                  (strcasecmp(v, "true") == 0);
+            } else if(strcmp(k, "skip_error") == 0) {
+               nfc_playlist->worker_info.settings->skip_error = (strcasecmp(v, "true") == 0);
+            } else if(strcmp(k, "loop") == 0) {
+               nfc_playlist->worker_info.settings->loop = (strcasecmp(v, "true") == 0);
+            } else if(strcmp(k, "user_controls") == 0) {
+               nfc_playlist->worker_info.settings->user_controls = (strcasecmp(v, "true") == 0);
+            }
+         }
+
+         file_stream_close(stream);
+         furi_string_free(line);
+         furi_string_free(key);
+         furi_string_free(value);
+      }
+      stream_free(stream);
+   }
+
+   furi_record_close(RECORD_STORAGE);
+}
+
+void nfc_playlist_save_settings(void* context) {
+   furi_assert(context);
+   NfcPlaylist* nfc_playlist = context;
+
+   FuriString* tmp_str = furi_string_alloc();
+
+   furi_string_printf(
+      tmp_str,
+      "emulate_timeout=%d\nemulate_delay=%d\nemulate_led_indicator=%s\nskip_error=%s\nloop=%s\nuser_controls=%s",
+      nfc_playlist->worker_info.settings->emulate_timeout,
+      nfc_playlist->worker_info.settings->emulate_delay,
+      nfc_playlist->worker_info.settings->emulate_led_indicator ? "true" : "false",
+      nfc_playlist->worker_info.settings->skip_error ? "true" : "false",
+      nfc_playlist->worker_info.settings->loop ? "true" : "false",
+      nfc_playlist->worker_info.settings->user_controls ? "true" : "false");
+
+   Storage* storage = furi_record_open(RECORD_STORAGE);
+   Stream* stream = file_stream_alloc(storage);
+
+   file_stream_open(stream, SETTINGS_LOCATION, FSAM_READ_WRITE, FSOM_OPEN_ALWAYS);
+   stream_clean(stream);
+   stream_write_string(stream, tmp_str);
+   file_stream_close(stream);
+   stream_free(stream);
+   furi_record_close(RECORD_STORAGE);
+
+   furi_string_free(tmp_str);
+}
+
+void nfc_playlist_delete_settings(void* context) {
+   furi_assert(context);
+   NfcPlaylist* nfc_playlist = context;
+
+   Storage* storage = furi_record_open(RECORD_STORAGE);
+
+   if(storage_file_exists(storage, SETTINGS_LOCATION)) {
+      storage_simply_remove(storage, SETTINGS_LOCATION);
+   }
+
+   furi_record_close(RECORD_STORAGE);
+
+   nfc_playlist_load_settings(nfc_playlist);
+}
+
 static NfcPlaylist* nfc_playlist_alloc() {
    NfcPlaylist* nfc_playlist = malloc(sizeof(NfcPlaylist));
    furi_assert(nfc_playlist);
@@ -44,12 +151,11 @@ static NfcPlaylist* nfc_playlist_alloc() {
    furi_assert(nfc_playlist->worker_info.settings);
 
    nfc_playlist->worker_info.settings->playlist_path = furi_string_alloc();
-   nfc_playlist->worker_info.settings->emulate_timeout = default_emulate_timeout;
-   nfc_playlist->worker_info.settings->emulate_delay = default_emulate_delay;
-   nfc_playlist->worker_info.settings->emulate_led_indicator = default_emulate_led_indicator;
-   nfc_playlist->worker_info.settings->skip_error = default_skip_error;
-   nfc_playlist->worker_info.settings->loop = default_loop;
-   nfc_playlist->worker_info.settings->user_controls = default_user_controls;
+   nfc_playlist_load_settings(nfc_playlist);
+
+   if(!storage_dir_exists(storage, PLAYLIST_DIR)) {
+      storage_simply_mkdir(storage, PLAYLIST_DIR);
+   }
 
    view_dispatcher_set_event_callback_context(nfc_playlist->view_dispatcher, nfc_playlist);
    view_dispatcher_set_custom_event_callback(
diff --git a/nfc_playlist.h b/nfc_playlist.h
@@ -27,8 +27,9 @@
 extern "C" {
 #endif
 
-#define PLAYLIST_LOCATION     "/ext/apps_data/nfc_playlist/"
-#define PLAYLIST_DIR          "/ext/apps_data/nfc_playlist"
+#define PLAYLIST_LOCATION     "/ext/apps_data/nfc_playlist/playlists/"
+#define PLAYLIST_DIR          "/ext/apps_data/nfc_playlist/playlists"
+#define SETTINGS_LOCATION     "/ext/apps_data/nfc_playlist/settings.txt"
 #define NFC_ITEM_LOCATION     "/ext/nfc/"
 #define MAX_PLAYLIST_NAME_LEN 50
 
@@ -73,6 +74,24 @@ typedef struct {
    NfcPlaylistWorkerInfo worker_info;
 } NfcPlaylist;
 
+/**
+ * Load the NFC playlist settings from persistent storage.
+ * @param context The context pointer to the NfcPlaylist instance.
+ */
+void nfc_playlist_load_settings(void* context);
+
+/**
+ * Save the NFC playlist settings to persistent storage.
+ * @param context The context pointer to the NfcPlaylist instance.
+ */
+void nfc_playlist_save_settings(void* context);
+
+/**
+ * Delete the NFC playlist settings from persistent storage.
+ * @param context The context pointer to the NfcPlaylist instance.
+ */
+void nfc_playlist_delete_settings(void* context);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/scenes/nfc_playlist_scene_settings.c b/scenes/nfc_playlist_scene_settings.c
@@ -7,7 +7,10 @@ typedef enum {
    NfcPlaylistSettings_SkipError,
    NfcPlaylistSettings_Loop,
    NfcPlaylistSettings_UserControls,
-   NfcPlaylistSettings_Reset
+   NfcPlaylistSettings_Reset,
+   NfcPlaylistSettings_SaveSettings,
+   NfcPlaylistSettings_ReloadSettings,
+   NfcPlaylistSettings_DeleteSettings,
 } NfcPlaylistSettingsMenuSelection;
 
 static void nfc_playlist_settings_menu_callback(void* context, uint32_t index) {
@@ -144,7 +147,16 @@ void nfc_playlist_settings_scene_on_enter(void* context) {
    variable_item_set_current_value_text(
       user_controls_setting, nfc_playlist->worker_info.settings->user_controls ? "ON" : "OFF");
 
-   variable_item_list_add(nfc_playlist->views.variable_item_list, "Reset settings", 0, NULL, NULL);
+   variable_item_list_add(
+      nfc_playlist->views.variable_item_list, "Back to defaults", 0, NULL, NULL);
+
+   variable_item_list_add(nfc_playlist->views.variable_item_list, "Save settings", 0, NULL, NULL);
+
+   variable_item_list_add(
+      nfc_playlist->views.variable_item_list, "Reload settings", 0, NULL, NULL);
+
+   variable_item_list_add(
+      nfc_playlist->views.variable_item_list, "Delete saved settings", 0, NULL, NULL);
 
    VariableItem* credits = variable_item_list_add(
       nfc_playlist->views.variable_item_list, "acegoal07, xtruan, WillyJL", 1, NULL, NULL);
@@ -156,76 +168,93 @@ void nfc_playlist_settings_scene_on_enter(void* context) {
    view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_VariableItemList);
 }
 
+static void nfc_playlist_settings_update_view(void* context) {
+   furi_assert(context);
+   NfcPlaylist* nfc_playlist = context;
+
+   FuriString* tmp_str = furi_string_alloc();
+
+   VariableItem* emulation_timeout_setting =
+      variable_item_list_get(nfc_playlist->views.variable_item_list, NfcPlaylistSettings_Timeout);
+   variable_item_set_current_value_index(
+      emulation_timeout_setting, nfc_playlist->worker_info.settings->emulate_timeout);
+   furi_string_printf(
+      tmp_str,
+      "%ds",
+      options_emulate_timeout[nfc_playlist->worker_info.settings->emulate_timeout]);
+   variable_item_set_current_value_text(emulation_timeout_setting, furi_string_get_cstr(tmp_str));
+
+   VariableItem* emulation_delay_setting =
+      variable_item_list_get(nfc_playlist->views.variable_item_list, NfcPlaylistSettings_Delay);
+   variable_item_set_current_value_index(
+      emulation_delay_setting, nfc_playlist->worker_info.settings->emulate_delay);
+   furi_string_printf(
+      tmp_str, "%ds", options_emulate_delay[nfc_playlist->worker_info.settings->emulate_delay]);
+   variable_item_set_current_value_text(emulation_delay_setting, furi_string_get_cstr(tmp_str));
+
+   furi_string_free(tmp_str);
+
+   VariableItem* emulation_led_indicator_setting = variable_item_list_get(
+      nfc_playlist->views.variable_item_list, NfcPlaylistSettings_LedIndicator);
+   variable_item_set_current_value_index(
+      emulation_led_indicator_setting, nfc_playlist->worker_info.settings->emulate_led_indicator);
+   variable_item_set_current_value_text(
+      emulation_led_indicator_setting,
+      nfc_playlist->worker_info.settings->emulate_led_indicator ? "ON" : "OFF");
+
+   VariableItem* emulation_skip_error_setting = variable_item_list_get(
+      nfc_playlist->views.variable_item_list, NfcPlaylistSettings_SkipError);
+   variable_item_set_current_value_index(
+      emulation_skip_error_setting, nfc_playlist->worker_info.settings->skip_error);
+   variable_item_set_current_value_text(
+      emulation_skip_error_setting, nfc_playlist->worker_info.settings->skip_error ? "ON" : "OFF");
+
+   VariableItem* loop_setting =
+      variable_item_list_get(nfc_playlist->views.variable_item_list, NfcPlaylistSettings_Loop);
+   variable_item_set_current_value_index(loop_setting, nfc_playlist->worker_info.settings->loop);
+   variable_item_set_current_value_text(
+      loop_setting, nfc_playlist->worker_info.settings->loop ? "ON" : "OFF");
+
+   VariableItem* user_controls_setting = variable_item_list_get(
+      nfc_playlist->views.variable_item_list, NfcPlaylistSettings_UserControls);
+   variable_item_set_current_value_index(
+      user_controls_setting, nfc_playlist->worker_info.settings->user_controls);
+   variable_item_set_current_value_text(
+      user_controls_setting, nfc_playlist->worker_info.settings->user_controls ? "ON" : "OFF");
+}
+
 bool nfc_playlist_settings_scene_on_event(void* context, SceneManagerEvent event) {
    furi_assert(context);
    NfcPlaylist* nfc_playlist = context;
    bool consumed = false;
    if(event.type == SceneManagerEventTypeCustom) {
       switch(event.event) {
+      case NfcPlaylistSettings_SaveSettings: {
+         nfc_playlist_save_settings(nfc_playlist);
+         consumed = true;
+         break;
+      }
+      case NfcPlaylistSettings_ReloadSettings: {
+         nfc_playlist_load_settings(nfc_playlist);
+         nfc_playlist_settings_update_view(nfc_playlist);
+         consumed = true;
+         break;
+      }
+      case NfcPlaylistSettings_DeleteSettings: {
+         nfc_playlist_delete_settings(nfc_playlist);
+         nfc_playlist_settings_update_view(nfc_playlist);
+         consumed = true;
+         break;
+      }
       case NfcPlaylistSettings_Reset: {
-         FuriString* tmp_str = furi_string_alloc();
-
          nfc_playlist->worker_info.settings->emulate_timeout = default_emulate_timeout;
-         VariableItem* emulation_timeout_setting = variable_item_list_get(
-            nfc_playlist->views.variable_item_list, NfcPlaylistSettings_Timeout);
-         variable_item_set_current_value_index(
-            emulation_timeout_setting, nfc_playlist->worker_info.settings->emulate_timeout);
-         furi_string_printf(
-            tmp_str,
-            "%ds",
-            options_emulate_timeout[nfc_playlist->worker_info.settings->emulate_timeout]);
-         variable_item_set_current_value_text(
-            emulation_timeout_setting, furi_string_get_cstr(tmp_str));
-
          nfc_playlist->worker_info.settings->emulate_delay = default_emulate_delay;
-         VariableItem* emulation_delay_setting = variable_item_list_get(
-            nfc_playlist->views.variable_item_list, NfcPlaylistSettings_Delay);
-         variable_item_set_current_value_index(
-            emulation_delay_setting, nfc_playlist->worker_info.settings->emulate_delay);
-         furi_string_printf(
-            tmp_str,
-            "%ds",
-            options_emulate_delay[nfc_playlist->worker_info.settings->emulate_delay]);
-         variable_item_set_current_value_text(
-            emulation_delay_setting, furi_string_get_cstr(tmp_str));
-
-         furi_string_free(tmp_str);
-
          nfc_playlist->worker_info.settings->emulate_led_indicator = default_emulate_led_indicator;
-         VariableItem* emulation_led_indicator_setting = variable_item_list_get(
-            nfc_playlist->views.variable_item_list, NfcPlaylistSettings_LedIndicator);
-         variable_item_set_current_value_index(
-            emulation_led_indicator_setting,
-            nfc_playlist->worker_info.settings->emulate_led_indicator);
-         variable_item_set_current_value_text(
-            emulation_led_indicator_setting,
-            nfc_playlist->worker_info.settings->emulate_led_indicator ? "ON" : "OFF");
-
          nfc_playlist->worker_info.settings->skip_error = default_skip_error;
-         VariableItem* emulation_skip_error_setting = variable_item_list_get(
-            nfc_playlist->views.variable_item_list, NfcPlaylistSettings_SkipError);
-         variable_item_set_current_value_index(
-            emulation_skip_error_setting, nfc_playlist->worker_info.settings->skip_error);
-         variable_item_set_current_value_text(
-            emulation_skip_error_setting,
-            nfc_playlist->worker_info.settings->skip_error ? "ON" : "OFF");
-
          nfc_playlist->worker_info.settings->loop = default_loop;
-         VariableItem* loop_setting = variable_item_list_get(
-            nfc_playlist->views.variable_item_list, NfcPlaylistSettings_Loop);
-         variable_item_set_current_value_index(
-            loop_setting, nfc_playlist->worker_info.settings->loop);
-         variable_item_set_current_value_text(
-            loop_setting, nfc_playlist->worker_info.settings->loop ? "ON" : "OFF");
-
          nfc_playlist->worker_info.settings->user_controls = default_user_controls;
-         VariableItem* user_controls_setting = variable_item_list_get(
-            nfc_playlist->views.variable_item_list, NfcPlaylistSettings_UserControls);
-         variable_item_set_current_value_index(
-            user_controls_setting, nfc_playlist->worker_info.settings->user_controls);
-         variable_item_set_current_value_text(
-            user_controls_setting,
-            nfc_playlist->worker_info.settings->user_controls ? "ON" : "OFF");
+
+         nfc_playlist_settings_update_view(nfc_playlist);
 
          consumed = true;
          break;
