From 12ed98733359fea55de57ed12f7e44981906fea6 Mon Sep 17 00:00:00 2001
From: Adam Honse <calcprogrammer1@gmail.com>
Date: Wed, 4 Nov 2020 20:28:23 -0600
Subject: [PATCH] Rework Espurna detection to use Settings Manager

---
 .../EspurnaControllerDetect.cpp               | 83 +++++++++----------
 1 file changed, 40 insertions(+), 43 deletions(-)

diff --git a/Controllers/EspurnaController/EspurnaControllerDetect.cpp b/Controllers/EspurnaController/EspurnaControllerDetect.cpp
index a5ca722c6..5c440a305 100644
--- a/Controllers/EspurnaController/EspurnaControllerDetect.cpp
+++ b/Controllers/EspurnaController/EspurnaControllerDetect.cpp
@@ -2,21 +2,11 @@
 #include "EspurnaController.h"
 #include "RGBController.h"
 #include "RGBController_Espurna.h"
+#include "SettingsManager.h"
 #include <vector>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <fcntl.h>
-#include <string.h>
-#include <fstream>
-#include <iostream>
-#include <string>
-
-#ifndef WIN32
-#include <unistd.h>
-#include <dirent.h>
-#endif
-
 /******************************************************************************************\
 *                                                                                          *
 *   DetectEspurnaControllers                                                               *
@@ -27,48 +17,55 @@
 
 void DetectEspurnaControllers(std::vector<RGBController*> &rgb_controllers)
 {
-    EspurnaController* new_espurna;
-    RGBController_Espurna* new_controller;
+    EspurnaController*      new_espurna;
+    RGBController_Espurna*  new_controller;
+    json                    espurna_settings;
 
-    std::ifstream infile;
-    char arg1[64];
+    /*-------------------------------------------------*\
+    | Get Espurna settings from settings manager        |
+    \*-------------------------------------------------*/
+    espurna_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_EspurnaDevices");
 
-    //Open settings file
-    infile.open("espurna.txt");
-
-    if (infile.good())
+    /*-------------------------------------------------*\
+    | If the Espurna settings contains devices, process |
+    \*-------------------------------------------------*/
+    if(espurna_settings.contains("devices"))
     {
-        for (std::string line; std::getline(infile, line); )
+        for(unsigned int device_idx = 0; device_idx < espurna_settings["devices"].size(); device_idx++)
         {
-            if (line == "")
+            std::string ip;
+            std::string port;
+            std::string apikey;
+
+            if(espurna_settings["devices"][device_idx].contains("ip"))
             {
-                continue;
+                ip = espurna_settings["devices"][device_idx]["ip"];
             }
-            if ((line[0] != ';') && (line[0] != '#') && (line[0] != '/'))
+
+            if(espurna_settings["devices"][device_idx].contains("port"))
             {
-                char * argument;
-                char * value;
-
-                value = (char *)line.c_str();
-
-                argument = strtok_s(value, "=", &value);
-
-                //Strip off new line characters if present
-                argument = strtok(argument, "\r\n");
-                value    = strtok(value, "\r\n");
-
-                if(argument)
+                if(espurna_settings["devices"][device_idx]["port"].type() == json::value_t::string)
                 {
-                    if (strcmp(argument, "espurna") == 0)
-                    {
-                        new_espurna = new EspurnaController();
-                        new_espurna->Initialize(value);
-
-                        new_controller = new RGBController_Espurna(new_espurna);
-                        rgb_controllers.push_back(new_controller);
-                    }
+                    port = espurna_settings["devices"][device_idx]["port"];
+                }
+                else
+                {
+                    port = std::to_string((unsigned int)espurna_settings["devices"][device_idx]["port"]);
                 }
             }
+
+            if(espurna_settings["devices"][device_idx].contains("apikey"))
+            {
+                apikey = espurna_settings["devices"][device_idx]["apikey"];
+            }
+
+            std::string value = ip + "," + port + "," + apikey;
+
+            new_espurna = new EspurnaController();
+            new_espurna->Initialize((char *)value.c_str());
+
+            new_controller = new RGBController_Espurna(new_espurna);
+            rgb_controllers.push_back(new_controller);
         }
     }