From 16654d3c905862dbbd81fc70997e014fc32e0e5a Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Wed, 17 Apr 2024 00:25:55 +0100
Subject: [PATCH] Allow empty prefix in name generator

---
 lib/toolbox/name_generator.c | 72 +++++++++++++++++++++++-------------
 1 file changed, 46 insertions(+), 26 deletions(-)

diff --git a/lib/toolbox/name_generator.c b/lib/toolbox/name_generator.c
index 09e963b9e..ea6213d98 100644
--- a/lib/toolbox/name_generator.c
+++ b/lib/toolbox/name_generator.c
@@ -74,22 +74,29 @@ void name_generator_make_random_prefixed(
     uint8_t name_generator_left_i = rand() % COUNT_OF(name_generator_left);
     uint8_t name_generator_right_i = rand() % COUNT_OF(name_generator_right);
 
-    if(prefix_after) {
-        snprintf(
-            name,
-            max_name_size,
-            "%s-%s%s%s",
-            name_generator_left[name_generator_left_i],
-            name_generator_right[name_generator_right_i],
-            prefix ? "_" : "",
-            prefix ? prefix : "");
+    if(prefix) {
+        if(prefix_after) {
+            snprintf(
+                name,
+                max_name_size,
+                "%s-%s_%s",
+                name_generator_left[name_generator_left_i],
+                name_generator_right[name_generator_right_i],
+                prefix);
+        } else {
+            snprintf(
+                name,
+                max_name_size,
+                "%s_%s-%s",
+                prefix,
+                name_generator_left[name_generator_left_i],
+                name_generator_right[name_generator_right_i]);
+        }
     } else {
         snprintf(
             name,
             max_name_size,
-            "%s%s%s-%s",
-            prefix ? prefix : "",
-            prefix ? "_" : "",
+            "%s-%s",
             name_generator_left[name_generator_left_i],
             name_generator_right[name_generator_right_i]);
     }
@@ -119,24 +126,37 @@ void name_generator_make_detailed_datetime(
         furi_hal_rtc_get_datetime(&dateTime);
     }
 
-    if(prefix_after) {
-        snprintf(
-            name,
-            max_name_size,
-            "%.4d-%.2d-%.2d_%.2d,%.2d,%.2d_%s",
-            dateTime.year,
-            dateTime.month,
-            dateTime.day,
-            dateTime.hour,
-            dateTime.minute,
-            dateTime.second,
-            prefix);
+    if(prefix) {
+        if(prefix_after) {
+            snprintf(
+                name,
+                max_name_size,
+                "%.4d-%.2d-%.2d_%.2d,%.2d,%.2d_%s",
+                dateTime.year,
+                dateTime.month,
+                dateTime.day,
+                dateTime.hour,
+                dateTime.minute,
+                dateTime.second,
+                prefix);
+        } else {
+            snprintf(
+                name,
+                max_name_size,
+                "%s_%.4d-%.2d-%.2d_%.2d,%.2d,%.2d",
+                prefix,
+                dateTime.year,
+                dateTime.month,
+                dateTime.day,
+                dateTime.hour,
+                dateTime.minute,
+                dateTime.second);
+        }
     } else {
         snprintf(
             name,
             max_name_size,
-            "%s_%.4d-%.2d-%.2d_%.2d,%.2d,%.2d",
-            prefix,
+            "%.4d-%.2d-%.2d_%.2d,%.2d,%.2d",
             dateTime.year,
             dateTime.month,
             dateTime.day,