CLI: Add 'clear' command and command suggestion

applications/services/cli/cli.c

@@ -8,6 +8,7 @@
 #include <flipper_application/plugins/plugin_manager.h>
 #include <loader/firmware_api/firmware_api.h>
 #include <inttypes.h>
+#include <stdlib.h>
 
 #define TAG "CliSrv"
 
@@ -208,6 +209,31 @@ static void cli_execute_command(Cli* cli, CliCommand* command, FuriString* args)
     }
 }
 
+static size_t cli_string_distance(const char* s1, const char* s2) {
+    size_t len1 = strlen(s1), len2 = strlen(s2);
+    size_t distance = 0;
+
+    for(size_t i = 0; i < MIN(len1, len2); i++) {
+        if(tolower(s1[i]) != tolower(s2[i])) distance++;
+    }
+    return distance + (len1 > len2 ? len1 - len2 : len2 - len1);
+}
+
+static void cli_find_similar_command(Cli* cli, const char* input, FuriString* suggestion) {
+    size_t min_distance = SIZE_MAX;
+    furi_string_reset(suggestion);
+
+    CliCommandTree_it_t it;
+    for(CliCommandTree_it(it, cli->commands); !CliCommandTree_end_p(it); CliCommandTree_next(it)) {
+        const char* cmd_name = furi_string_get_cstr(*CliCommandTree_ref(it)->key_ptr);
+        size_t distance = cli_string_distance(input, cmd_name);
+        if(distance < min_distance && distance <= 3) {
+            min_distance = distance;
+            furi_string_set(suggestion, cmd_name);
+        }
+    }
+}
+
 static void cli_handle_enter(Cli* cli) {
     cli_normalize_line(cli);
 
@@ -245,9 +271,21 @@ static void cli_handle_enter(Cli* cli) {
     } else {
         furi_check(furi_mutex_release(cli->mutex) == FuriStatusOk);
         cli_nl(cli);
-        printf(
-            "`%s` command not found, use `help` or `?` to list all available commands",
-            furi_string_get_cstr(command));
+        FuriString* suggestion = furi_string_alloc();
+        cli_find_similar_command(cli, furi_string_get_cstr(command), suggestion);
+
+        if(furi_string_size(suggestion) > 0) {
+            printf(
+                "`%s` command not found, did you mean `%s`? Use `help` or `?` to list all available commands",
+                furi_string_get_cstr(command),
+                furi_string_get_cstr(suggestion));
+        } else {
+            printf(
+                "`%s` command not found, use `help` or `?` to list all available commands",
+                furi_string_get_cstr(command));
+        }
+
+        furi_string_free(suggestion);
         cli_putc(cli, CliKeyBell);
     }
 

applications/services/cli/cli_commands.c

@@ -682,6 +682,13 @@ void cli_command_i2c(Cli* cli, FuriString* args, void* context) {
     furi_hal_i2c_release(&furi_hal_i2c_handle_external);
 }
 
+void cli_command_clear(Cli* cli, FuriString* args, void* context) {
+    UNUSED(cli);
+    UNUSED(args);
+    UNUSED(context);
+    printf("\e[2J\e[H");
+}
+
 CLI_PLUGIN_WRAPPER("info", cli_command_info)
 CLI_PLUGIN_WRAPPER("src", cli_command_src)
 CLI_PLUGIN_WRAPPER("neofetch", cli_command_neofetch)
@@ -693,6 +700,7 @@ CLI_PLUGIN_WRAPPER("vibro", cli_command_vibro)
 CLI_PLUGIN_WRAPPER("led", cli_command_led)
 CLI_PLUGIN_WRAPPER("gpio", cli_command_gpio)
 CLI_PLUGIN_WRAPPER("i2c", cli_command_i2c)
+CLI_PLUGIN_WRAPPER("clear", cli_command_clear)
 
 void cli_commands_init(Cli* cli) {
     cli_add_command(cli, "!", CliCommandFlagParallelSafe, cli_command_info_wrapper, (void*)true);
@@ -724,4 +732,7 @@ void cli_commands_init(Cli* cli) {
     cli_add_command(cli, "led", CliCommandFlagDefault, cli_command_led_wrapper, NULL);
     cli_add_command(cli, "gpio", CliCommandFlagDefault, cli_command_gpio_wrapper, NULL);
     cli_add_command(cli, "i2c", CliCommandFlagDefault, cli_command_i2c_wrapper, NULL);
+
+    cli_add_command(cli, "clear", CliCommandFlagParallelSafe, cli_command_clear, NULL);
+    cli_add_command(cli, "cls", CliCommandFlagParallelSafe, cli_command_clear, NULL);
 }