MX 2 лет назад
Родитель
Сommit
3b2cf0b664
3 измененных файлов с 6 добавлено и 3 удалено
  1. 2 0
      fuzzer.c
  2. 1 0
      fuzzer_i.h
  3. 3 3
      scenes/fuzzer_scene_save_name.c

+ 2 - 0
fuzzer.c

@@ -140,6 +140,7 @@ int32_t fuzzer_start_ibtn(void* p) {
         .key_extension = ".ibtn",
         .path_key_folder = "/ext/ibutton",
         .key_icon = &I_ibutt_10px,
+        .file_prefix = "iBtn",
     };
     fuzzer_app->fuzzer_const = &app_const;
 
@@ -159,6 +160,7 @@ int32_t fuzzer_start_rfid(void* p) {
         .key_extension = ".rfid",
         .path_key_folder = "/ext/lfrfid",
         .key_icon = &I_125_10px,
+        .file_prefix = "RFID",
     };
     fuzzer_app->fuzzer_const = &app_const;
 

+ 1 - 0
fuzzer_i.h

@@ -32,6 +32,7 @@ typedef struct {
     const char* key_extension;
     const char* path_key_folder;
     const Icon* key_icon;
+    const char* file_prefix;
 } FuzzerConsts;
 
 typedef struct {

+ 3 - 3
scenes/fuzzer_scene_save_name.c

@@ -1,6 +1,6 @@
 #include "../fuzzer_i.h"
 
-#include <toolbox/random_name.h>
+#include <toolbox/name_generator.h>
 #include <toolbox/path.h>
 
 static void fuzzer_scene_save_name_text_input_callback(void* context) {
@@ -12,7 +12,7 @@ void fuzzer_scene_save_name_on_enter(void* context) {
     PacsFuzzerApp* app = context;
     TextInput* text_input = app->text_input;
 
-    set_random_name(app->key_name, KEY_NAME_SIZE);
+    name_generator_make_auto(app->key_name, KEY_NAME_SIZE, app->fuzzer_const->file_prefix);
 
     text_input_set_header_text(text_input, "Name the key");
     text_input_set_result_callback(
@@ -21,7 +21,7 @@ void fuzzer_scene_save_name_on_enter(void* context) {
         app,
         app->key_name,
         KEY_NAME_SIZE,
-        false);
+        true);
 
     ValidatorIsFile* validator_is_file = validator_is_file_alloc_init(
         app->fuzzer_const->path_key_folder, app->fuzzer_const->key_extension, app->key_name);