Small refactoring

Author: je-s

examples/test/test.ino

@@ -1,4 +1,4 @@
-/*  
+/*
     Copyright 2019 Jan-Eric Schober
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -69,13 +69,13 @@ void cmdHello( String arguments, StreamCommander * instance )
 
 void cmdPointer( String arguments, StreamCommander * instance )
 {
-    instance->sendResponse( "Pointer address is 0x" + String( (unsigned int)instance, HEX )  );
+    instance->sendResponse( "Pointer address is 0x" + String( (unsigned int)instance, HEX ) );
 }
 
 void cmdLed( String arguments, StreamCommander * instance )
 {
     arguments.trim();
-    
+
     if ( arguments.equals( "on" ) )
     {
         digitalWrite( LED_BUILTIN, HIGH );

src/StreamCommander.cpp

@@ -364,6 +364,43 @@ StreamCommander::DefaultCallbackFunction StreamCommander::getDefaultCallback()
     return this->defaultCallbackFunction;
 }
 
+void StreamCommander::executeCommand( String command, String arguments )
+{
+    // Send an Echo
+    if ( shouldEchoCommands() )
+    {
+        if ( arguments.length() )
+        {
+            sendEcho( command + " " + arguments );
+        }
+        else
+        {
+            sendEcho( command );
+        }
+    }
+
+    // Try to find our input-command and execute it
+    CommandContainer * container = getCommandContainer( command );
+
+    // If a container for this command has been found, try to call the callback
+    if ( container != nullptr )
+    {
+        if ( container->callbackFunction != nullptr )
+        {
+            // Call our Callback-Function with the arguments and our object-instance
+            container->callbackFunction( arguments, this );
+        }
+        else
+        {
+            sendError( "Command callback function for command '" + command + "' is empty." );
+        }
+    }
+    else
+    {
+        getDefaultCallback()( command, arguments, this );
+    }
+}
+
 void StreamCommander::fetchCommand()
 {
     Stream * streamInstance = getStreamInstance();
@@ -419,39 +456,7 @@ void StreamCommander::fetchCommand()
 
     command = commandBuffer.substring( 0, commandEnd );
 
-    // Send an Echo
-    if ( shouldEchoCommands() )
-    {
-        if ( arguments.length() )
-        {
-            sendEcho( command + " " + arguments );
-        }
-        else
-        {
-            sendEcho( command );
-        }
-    }
-
-    // Try to find our input-command and execute it
-    CommandContainer * container = getCommandContainer( command );
-
-    // If a container for this command has been found, try to call the callback
-    if ( container != nullptr )
-    {
-        if ( container->callbackFunction != nullptr )
-        {
-            // Call our Callback-Function with the arguments and our object-instance
-            container->callbackFunction( arguments, this );
-        }
-        else
-        {
-            sendError( "Command callback function for command '" + command + "' is empty." );
-        }
-    }
-    else
-    {
-        getDefaultCallback()( command, arguments, this );
-    }
+    executeCommand( command, arguments );
 }
 
 void StreamCommander::sendMessage( String type, String content )

src/StreamCommander.hpp

@@ -82,17 +82,18 @@ class StreamCommander
     bool shouldAddStandardCommands(); // Returns whether the standard commadns should be added or not.
     void saveIdToEeprom( String id ); // Saves and ID to the EEPROM if it differs from the old one.
     void loadIdFromEeprom(); // Loads the ID from the EEPROM.
+    CommandContainer * getCommandContainer( String command ); // Gets the container containing all commands.
+    int getCommandContainerIndex( String command ); // Returns the index (position) of a specific command in the command container by name.
     void deleteCommands(); // Deletes all registered commands.
     void setNumCommands( int numCommands ); // Sets the number of the currently registered commands.
     void incrementNumCommands(); // Increments the number of the currently registered commands.
-    CommandContainer * getCommandContainer( String command ); // Gets the container containing all commands.
-    int getCommandContainerIndex( String command ); // Returns the index (position) of a specific command in the command container by name.
+    void executeCommand( String command, String arguments ); // Tries to execute a command with given arguments. Arguments can be empty.
 
     static void commandActivate( String arguments, StreamCommander * instance );// Definition of the command COMMAND_ACTIVATE.
     static void commandDeactivate( String arguments, StreamCommander * instance ); // Definition of the command COMMAND_DEACTIVATE.
     static void commandIsActive( String arguments, StreamCommander * instance ); // Definition of the command COMMAND_ISACTIVE.
     static void commandSetEcho( String arguments, StreamCommander * instance ); // Definition of the command COMMAND_SETECHO.
-    static void commandSetId(  String id, StreamCommander * instance ); // Definition of the command COMMAND_SETID.
+    static void commandSetId( String id, StreamCommander * instance ); // Definition of the command COMMAND_SETID.
     static void commandGetId( String arguments, StreamCommander * instance ); // Definition of the command COMMAND_GETID.
     static void commandPing( String arguments, StreamCommander * instance ); // Definition of the command COMMAND_PING.
     static void commandGetStatus( String arguments, StreamCommander * instance ); // Definition of the command COMMAND_GETSTATUS.