fixed thread issue, no more lambda, separated thread to other file

Author: marttcw

README.md

@@ -18,7 +18,6 @@ Minimal dependencies needed:
 ### C++ Requirements
 * C++11 for std::thread
 * C++11 for std::function
-* C++11 for lambda expressions
 * C++17 for std::filesystem
 * C++17 for cleaner for loop over std::pair
 

meson.build

@@ -1,7 +1,7 @@
 project('steamcountsnotifyd'
   , 'cpp'
   , default_options : ['warning_level=3', 'cpp_std=c++17', 'optimization=3', 'werror=false']
-  , version : 'PRE-ALPHA 20190910'
+  , version : 'PRE-ALPHA 20190911'
 )
 
 cc = meson.get_compiler('cpp')
@@ -27,6 +27,7 @@ libnotify_dep = dependency('libnotify', required : true)  # libnotify
 src = [
     './src/main.cpp'
   , './src/core/params.cpp'
+  , './src/core/counterThread.cpp'
   , './src/tool/args.cpp'
   , './src/tool/getPlayerCount.cpp'
   , './src/tool/homeDirectory.cpp'

src/core/counterThread.cpp

@@ -0,0 +1,72 @@
+#include "core/counterThread.h"
+
+#include <thread>
+#include <chrono>
+
+#include "tool/getPlayerCount.h"
+#include "wrapper/curl.h"
+#include "wrapper/notify.h"
+
+void cthread::appidRunning(unsigned int appid, param::appidName_s game, const param::config &config)
+{
+  unsigned int  currentCount = 0;
+  bool          notify   = false;
+  bool          running  = true;
+  std::string   messageTitle;
+  std::string   messageDetails;
+  wrapper::curl curlJob;
+  unsigned int  currentThreadInterval = config.getIntervalMins();
+
+  curlJob.setTimeout(config.getConnectionTimeout());
+
+  while (running)
+  {
+    curlJob.setUrl("https://api.steampowered.com/ISteamUserStats/GetNumberOfCurrentPlayers/v1/?appid="+std::to_string(appid));
+
+    // Perform the job
+    curlJob.perform();
+
+    // Determine message
+    if (curlJob.getHttpResponseCode() == 200)
+    {
+      currentCount = tool::getPlayerCount(curlJob.getHttpData());
+      // If threshold met, then start notifying the user
+      if (currentCount >= game.threshold)
+      {
+        notify = true;
+        messageTitle = game.name;
+        messageDetails = "Player counts: "+std::to_string(currentCount);
+        currentThreadInterval = config.getThresholdIntervalMins();
+      }
+      // Otherwise reset to the desired under threshold interval
+      else
+      {
+        notify = false;
+        currentThreadInterval = config.getIntervalMins();
+      }
+    }
+    else
+    {
+      messageTitle = game.name+"(ERROR)";
+      messageDetails = "Cannot fetch player numbers - no internet connection or steam API is down.";
+    }
+
+    // Clear data
+    curlJob.clearHttpData();
+
+    // Notify
+    if (notify)
+    {
+      wrapper::notify notifyJob(messageTitle, messageDetails);
+      notifyJob.setTimeout(config.getNotificationTimeout());
+      notifyJob.show();
+      notifyJob.unref();
+
+      notify = false;
+    }
+
+    // Delay
+    std::this_thread::sleep_for(std::chrono::minutes(currentThreadInterval));
+  }
+}
+

src/core/counterThread.h

@@ -0,0 +1,12 @@
+#ifndef CORE__COUNTERTHREAD_H
+#define CORE__COUNTERTHREAD_H
+
+#include <functional>
+#include "core/params.h"
+
+namespace cthread
+{
+  void appidRunning(unsigned int appid, param::appidName_s game, const param::config &config);
+}
+
+#endif

src/core/params.cpp

@@ -15,44 +15,46 @@ void param::config::readConfigurationFile(const std::string &confFilePath)
 {
   std::unordered_map<std::string, unsigned int> strMapToVal;
   // Set default parameters
-  strMapToVal["interval"] = 1;
-  strMapToVal["thresholdinterval"] = 2;
-  strMapToVal["connectiontimeout"] = 10;
-  strMapToVal["notificationtimeout"] = 10;
-  this->appidMap[244630] = {"NEOTOKYO", 0};
-  this->appidMap[282440] = {"Quake Live", 100};
+  strMapToVal["interval"] = 1;                    // Minutes
+  strMapToVal["thresholdinterval"] = 2;           // Minutes
+  strMapToVal["connectiontimeout"] = 10;          // Seconds
+  strMapToVal["notificationtimeout"] = 10;        // Seconds
 
-  // Configuration file stream
-  std::ifstream confFile(confFilePath);
-
-  for (std::string line; std::getline(confFile, line); )
+  // Go over the configuration file
+  if (std::filesystem::exists(confFilePath))
   {
-    std::istringstream iss(line);
-    std::string parameter;
-    appidName_s valAN;
-    int val;
+    // Configuration file stream
+    std::ifstream confFile(confFilePath);
 
-    iss >> parameter;
-    if (parameter == "newappid")
-    {
-      iss >> val >> std::quoted(valAN.name) >> valAN.threshold;
-      this->appidMap[val] = valAN;
-    }
-    else
+    for (std::string line; std::getline(confFile, line); )
     {
-      iss >> val;
-      if (val >= 0)
+      std::istringstream iss(line);
+      std::string parameter;
+      appidName_s valAN;
+      int val;
+
+      iss >> parameter;
+      if (parameter == "newappid")
       {
-        strMapToVal[parameter] = static_cast<unsigned int>(val);
+        iss >> val >> std::quoted(valAN.name) >> valAN.threshold;
+        this->appidMap[val] = valAN;
       }
       else
       {
-        std::cerr << "ERROR: Value for '" << parameter << "' cannot be less than 0.\n";
+        iss >> val;
+        if (val >= 0)
+        {
+          strMapToVal[parameter] = static_cast<unsigned int>(val);
+        }
+        else
+        {
+          std::cerr << "ERROR: Value for '" << parameter << "' cannot be less than 0.\n";
+        }
       }
     }
-  }
 
-  confFile.close();
+    confFile.close();
+  }
 
   this->intervalMins = strMapToVal["interval"];
   this->thresholdIntervalMins = strMapToVal["thresholdinterval"];
@@ -63,19 +65,7 @@ void param::config::readConfigurationFile(const std::string &confFilePath)
 param::config::config()
 {
   // Read configuration file
-  const std::string &confFilePath = tool::getHomeDirectory()+"/.config/steamcountsnotifyd/config";
-
-  if (std::filesystem::exists(confFilePath))
-  {
-    this->readConfigurationFile(confFilePath);
-  }
-
-  /* VERBOSE
-  for (auto &an : this->appidMap)
-  {
-    std::cout << an.first << ' ' << an.second.name << ' ' << an.second.threshold << '\n';
-  }
-  */
+  this->readConfigurationFile(tool::getHomeDirectory()+"/.config/steamcountsnotifyd/config");
 }
 
 param::config::~config()

src/main.cpp

@@ -5,96 +5,45 @@
  * version Pre-Alpha 2019-09-11
  *
  * TODO:
- *  Threshold interval
- *  Threadding
  *  Daemonise
  */
 
 #include <iostream>
-#include <chrono>
 #include <thread>
 #include <deque>
 #include <vector>
 #include <functional>
 
+#include "core/counterThread.h"
+#include "core/params.h"
+#include "tool/args.h"
+#include "tool/getPlayerCount.h"
 #include "wrapper/curl.h"
+#include "wrapper/daemon.h"
 #include "wrapper/notify.h"
-#include "tool/getPlayerCount.h"
-#include "tool/args.h"
-#include "core/params.h"
 
+/* 
+ * Main function of steamcountsnotifyd
+ */
 int main(int argc, char **argv)
 {
   std::deque<std::string> args = tool::toArgs(argc, argv);
   args.pop_front();     // Program execution name not needed
   param::config config;
   bool          running = config.setFromArgs(args);
 
-  // Functional lambda
-  std::function<void(unsigned int, param::appidName_s, const param::config &)> appidRunningThread = [](unsigned int appid, param::appidName_s game, const param::config &config)
-  {
-    unsigned int  currentCount = 0;
-    bool          notify   = false;
-    bool          running  = true;
-    std::string   messageTitle;
-    std::string   messageDetails;
-    wrapper::curl curlJob;
-    unsigned int  currentThreadInterval = config.getIntervalMins();
-
-    curlJob.setTimeout(config.getConnectionTimeout());
-
-    while (running)
-    {
-      curlJob.setUrl("https://api.steampowered.com/ISteamUserStats/GetNumberOfCurrentPlayers/v1/?appid="+std::to_string(appid));
-
-      // Perform the job
-      curlJob.perform();
-
-      // Determine message
-      if (curlJob.getHttpResponseCode() == 200)
-      {
-        currentCount = tool::getPlayerCount(curlJob.getHttpData());
-        if (currentCount >= game.threshold)
-        {
-          notify = true;
-          messageTitle = game.name;
-          messageDetails = "Player counts: "+std::to_string(currentCount);
-        }
-      }
-      else
-      {
-        messageTitle = "ERROR";
-        messageDetails = "Cannot fetch player numbers - no internet connection or steam API is down.";
-      }
-
-      // Clear data
-      curlJob.clearHttpData();
-
-      // Notify
-      if (notify)
-      {
-        wrapper::notify::init();
-        wrapper::notify notifyJob(messageTitle, messageDetails);
-        notifyJob.setTimeout(config.getNotificationTimeout());
-        notifyJob.show();
-
-        notify = false;
-      }
-
-      // Delay
-      std::this_thread::sleep_for(std::chrono::minutes(currentThreadInterval));
-    }
-  };
-
   // If help or version message not used (normal execution)
   if (running)
   {
+    //std::function<void(unsigned int, param::appidName_s, const param::config &)> thread::appidRunning;
+    wrapper::notify::init("steamcountsnotifyd");
+
     // Initialise and run threads for each appid/game 
     std::vector<std::thread> appidThreadVector;
 
     for (const auto &[appid, game] : config.getAppidMap())
     {
-      appidThreadVector.emplace_back(std::thread(appidRunningThread, appid, game, config));
+      appidThreadVector.emplace_back(std::thread(std::function(cthread::appidRunning), appid, game, config));
     }
 
     // Join thread if joinable
@@ -105,6 +54,8 @@ int main(int argc, char **argv)
         thread.join();
       }
     }
+
+    wrapper::notify::uninit();
   }
 
   return 0;

src/wrapper/notify.cpp

@@ -7,13 +7,16 @@ wrapper::notify::notify(std::string_view summary, std::string_view body, std::st
 
 wrapper::notify::~notify()
 {
-  g_object_unref(G_OBJECT(this->notification));
-  notify_uninit();
 }
 
-void wrapper::notify::init()
+void wrapper::notify::init(std::string_view threadName)
+{
+  notify_init(threadName.data());
+}
+
+void wrapper::notify::uninit()
 {
-  notify_init("neonotifytokyo");
+  notify_uninit();
 }
 
 void wrapper::notify::show()
@@ -25,3 +28,8 @@ void wrapper::notify::setTimeout(unsigned int timeout)
 {
   notify_notification_set_timeout(this->notification, timeout);
 }
+
+void wrapper::notify::unref()
+{
+  g_object_unref(G_OBJECT(this->notification));
+}

src/wrapper/notify.h

@@ -13,9 +13,11 @@ namespace wrapper
   public:
     notify(std::string_view summary, std::string_view body, std::string_view icon = "dialog-information");
     ~notify();
-    void static init();
+    void static init(std::string_view threadName);
+    void static uninit();
     void show();
     void setTimeout(unsigned int timeout);
+    void unref();
   };
 }