Added id argument.

Author: shajen

sources/config.cpp

@@ -58,6 +58,7 @@ std::vector<FrequencyRange> readIgnoredRanges(const nlohmann::json& json) {
 Config::Config(const nlohmann::json& json, const ArgConfig& argConfig)
     : m_json(json),
       m_argConfig(argConfig),
+      m_id(!argConfig.id.empty() ? argConfig.id : generateRandomHash()),
       m_devices(SdrDeviceReader::readDevices(json)),
       m_isColorLogEnabled(readKey<bool>(json, {"output", "color_log_enabled"})),
       m_consoleLogLevel(parseLogLevel(readKey<std::string>(json, {"output", "console_log_level"}))),
@@ -109,6 +110,7 @@ void Config::saveToFile(const std::string& path, const nlohmann::json& json) {
 nlohmann::json Config::json() const { return m_json; }
 std::string Config::mqtt() const { return fmt::format("{}@{}", m_argConfig.mqttUser, m_argConfig.mqttUrl); };
 
+std::string Config::getId() const { return m_id; }
 std::vector<Device> Config::devices() const { return m_devices; }
 
 bool Config::isColorLogEnabled() const { return m_isColorLogEnabled; }

sources/config.h

@@ -36,6 +36,7 @@ constexpr auto SPECTROGRAM_SEND_INTERVAL = std::chrono::milliseconds(1000);  //
 
 struct ArgConfig {
   std::string configFile;
+  std::string id;
   std::string logFileName = "sdr_scanner.log";  // default log filename
   int logFileCount = 9;                         // default keep last n log files
   int logFileSize = 10 * 1024 * 1024;           // default single log file max size
@@ -51,6 +52,7 @@ class Config {
   nlohmann::json json() const;
   std::string mqtt() const;
 
+  std::string getId() const;
   std::vector<Device> devices() const;
 
   bool isColorLogEnabled() const;
@@ -74,6 +76,7 @@ class Config {
   const nlohmann::json m_json;
   const ArgConfig& m_argConfig;
 
+  const std::string m_id;
   const std::vector<Device> m_devices;
 
   const bool m_isColorLogEnabled;

sources/main.cpp

@@ -25,6 +25,7 @@ int main(int argc, char** argv) {
 
   ArgConfig argConfig;
   app.add_option("--config", argConfig.configFile, "config file")->required()->check(CLI::ExistingFile);
+  app.add_option("--id", argConfig.id);
   app.add_option("--log-file", argConfig.logFileName, "log file");
   app.add_option("--log-file-count", argConfig.logFileCount, "log file count")->check(CLI::PositiveNumber);
   app.add_option("--log-file-size", argConfig.logFileSize, "log file size")->check(CLI::PositiveNumber);
@@ -42,7 +43,6 @@ int main(int argc, char** argv) {
     Logger::configure(spdlog::level::info, spdlog::level::info, argConfig.logFileName, argConfig.logFileSize, argConfig.logFileCount, true);
     Logger::info(LABEL, "{}", colored(GREEN, "{}", "starting"));
 
-    const auto id = generateRandomHash();
     while (isRunning) {
       bool reload = false;
       const Config config = Config::loadFromFile(argConfig.configFile, argConfig);
@@ -51,7 +51,7 @@ int main(int argc, char** argv) {
       Logger::info(LABEL, "mqtt: {}", colored(GREEN, "{}", config.mqtt()));
 
       Mqtt mqtt(config);
-      RemoteController remoteController(config, id, mqtt, [&reload, &argConfig](const nlohmann::json& json) {
+      RemoteController remoteController(config, mqtt, [&reload, &argConfig](const nlohmann::json& json) {
         Logger::info(LABEL, "reload config: {}", colored(GREEN, "{}", json.dump()));
         Config::saveToFile(argConfig.configFile, json);
         reload = true;

sources/network/remote_controller.cpp

@@ -15,29 +15,28 @@ constexpr auto LABEL = "remote";
 
 using namespace std::placeholders;
 
-RemoteController::RemoteController(const Config& config, const std::string& id, Mqtt& mqtt, std::function<void(const nlohmann::json&)> configCallback)
-    : m_config(config), m_id(id), m_mqtt(mqtt), m_configCallback(configCallback) {
+RemoteController::RemoteController(const Config& config, Mqtt& mqtt, std::function<void(const nlohmann::json&)> configCallback) : m_config(config), m_mqtt(mqtt), m_configCallback(configCallback) {
   mqtt.setMessageCallback(fmt::format("sdr/{}", LIST), std::bind(&RemoteController::listCallback, this, _1));
-  mqtt.setMessageCallback(fmt::format("sdr/{}/{}", CONFIG, m_id), std::bind(&RemoteController::configCallback, this, _1));
+  mqtt.setMessageCallback(fmt::format("sdr/{}/{}", CONFIG, m_config.getId()), std::bind(&RemoteController::configCallback, this, _1));
   mqtt.setMessageCallback(fmt::format("sdr/{}", MANUAL_RECORDING), std::bind(&RemoteController::manualRecordingCallback, this, _1));
-  mqtt.setMessageCallback(fmt::format("sdr/{}/{}", RESTART, m_id), std::bind(&RemoteController::restartCallback, this, _1));
-  Logger::info(LABEL, "started, id: {}", colored(GREEN, "{}", m_id));
+  mqtt.setMessageCallback(fmt::format("sdr/{}/{}", RESTART, m_config.getId()), std::bind(&RemoteController::restartCallback, this, _1));
+  Logger::info(LABEL, "started, id: {}", colored(GREEN, "{}", m_config.getId()));
 }
 
 void RemoteController::listCallback(const std::string&) {
   Logger::info(LABEL, "received list");
-  m_mqtt.publish(fmt::format("sdr/{}/{}", STATUS, m_id), m_config.json().dump(), 2);
+  m_mqtt.publish(fmt::format("sdr/{}/{}", STATUS, m_config.getId()), m_config.json().dump(), 2);
 }
 
 void RemoteController::configCallback(const std::string& data) {
   Logger::info(LABEL, "received config");
   try {
     const auto json = nlohmann::json::parse(data);
     m_configCallback(json);
-    m_mqtt.publish(fmt::format("sdr/{}/{}/{}", CONFIG, m_id, SUCCESS), "", 2);
+    m_mqtt.publish(fmt::format("sdr/{}/{}/{}", CONFIG, m_config.getId(), SUCCESS), "", 2);
   } catch (const std::exception& e) {
     Logger::warn(LABEL, "invalid config");
-    m_mqtt.publish(fmt::format("sdr/{}/{}/{}", CONFIG, m_id, FAILED), "", 2);
+    m_mqtt.publish(fmt::format("sdr/{}/{}/{}", CONFIG, m_config.getId(), FAILED), "", 2);
   }
 }
 

sources/network/remote_controller.h

@@ -8,7 +8,7 @@
 
 class RemoteController {
  public:
-  RemoteController(const Config& config, const std::string& id, Mqtt& mqtt, std::function<void(const nlohmann::json&)> configCallback);
+  RemoteController(const Config& config, Mqtt& mqtt, std::function<void(const nlohmann::json&)> configCallback);
 
  private:
   void listCallback(const std::string& data);
@@ -17,7 +17,6 @@ class RemoteController {
   void restartCallback(const std::string& data);
 
   const Config& m_config;
-  const std::string m_id;
   Mqtt& m_mqtt;
   std::function<void(const nlohmann::json&)> m_configCallback;
 };