From 113c895d9ac2c6a6bf17e99e80ea9f07b3056360 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sat, 2 Sep 2023 23:05:53 +0200
Subject: [PATCH] Dynamic default rfid naming

---
 applications/main/lfrfid/lfrfid_i.h                    |  1 -
 .../main/lfrfid/scenes/lfrfid_scene_raw_name.c         |  2 +-
 .../main/lfrfid/scenes/lfrfid_scene_save_name.c        | 10 ++++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/applications/main/lfrfid/lfrfid_i.h b/applications/main/lfrfid/lfrfid_i.h
index fc9f861a5..67ec34090 100644
--- a/applications/main/lfrfid/lfrfid_i.h
+++ b/applications/main/lfrfid/lfrfid_i.h
@@ -35,7 +35,6 @@
 
 #include <lfrfid/scenes/lfrfid_scene.h>
 
-#define LFRFID_KEY_NAME_SIZE 22
 #define LFRFID_TEXT_STORE_SIZE 40
 
 #define LFRFID_APP_FOLDER ANY_PATH("lfrfid")
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_raw_name.c b/applications/main/lfrfid/scenes/lfrfid_scene_raw_name.c
index 3e09dbf08..945b8fd8f 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_raw_name.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_raw_name.c
@@ -20,7 +20,7 @@ void lfrfid_scene_raw_name_on_enter(void* context) {
         lfrfid_text_input_callback,
         app,
         app->text_store,
-        LFRFID_KEY_NAME_SIZE,
+        LFRFID_TEXT_STORE_SIZE,
         key_name_is_empty);
 
     ValidatorIsFile* validator_is_file =
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_save_name.c b/applications/main/lfrfid/scenes/lfrfid_scene_save_name.c
index 3a38e213d..70c47e8a4 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_save_name.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_save_name.c
@@ -12,8 +12,14 @@ void lfrfid_scene_save_name_on_enter(void* context) {
     if(key_name_is_empty) {
         furi_string_set(app->file_path, LFRFID_APP_FOLDER);
 
+        FuriString* prefix =
+            furi_string_alloc_set(protocol_dict_get_name(app->dict, app->protocol_id));
+        furi_string_replace_all(prefix, "/", "_");
+        furi_string_replace_all(prefix, " ", "_");
+        furi_string_left(prefix, 11);
         name_generator_make_auto(
-            app->text_store, LFRFID_TEXT_STORE_SIZE, LFRFID_APP_FILENAME_PREFIX);
+            app->text_store, LFRFID_TEXT_STORE_SIZE, furi_string_get_cstr(prefix));
+        furi_string_free(prefix);
 
         furi_string_set(folder_path, LFRFID_APP_FOLDER);
     } else {
@@ -27,7 +33,7 @@ void lfrfid_scene_save_name_on_enter(void* context) {
         lfrfid_text_input_callback,
         app,
         app->text_store,
-        LFRFID_KEY_NAME_SIZE,
+        LFRFID_TEXT_STORE_SIZE,
         key_name_is_empty);
 
     FURI_LOG_I("", "%s %s", furi_string_get_cstr(folder_path), app->text_store);