Version, Added folding on battery option, Added keep awake option

Author: jcoffland

CHANGELOG.md

@@ -1,6 +1,10 @@
 Folding@home Client Changelog
 =============================
 
+## v8.3.2
+ - Added folding on battery option
+ - Added keep awake option
+
 ## v8.3.1
  - Updated copyrights.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fah-client",
-  "version": "8.3.1",
+  "version": "8.3.2",
   "bin": {
     "fah-client": "./fah-client"
   },

src/fah/client/App.cpp

@@ -286,6 +286,7 @@ void App::setState(const string &state) {
 
 
 bool App::getPaused() const {return getGroups()->getPaused();}
+bool App::keepAwake() const {return getGroups()->keepAwake();}
 
 
 void App::validate(const Certificate &cert,

src/fah/client/App.h

@@ -128,6 +128,7 @@ namespace FAH {
       void setState(const cb::JSON::Value &msg);
       void setState(const std::string &state);
       bool getPaused() const;
+      bool keepAwake() const;
 
       const cb::KeyPair &getKey() const {return key;}
       void validate(const cb::Certificate &cert,

src/fah/client/Config.cpp

@@ -85,7 +85,9 @@ void Config::setState(const JSON::Value &msg) {
 }
 
 
-bool Config::getOnIdle() const {return getBoolean("on_idle");}
+bool Config::getOnIdle()    const {return getBoolean("on_idle");}
+bool Config::getOnBattery() const {return getBoolean("on_battery");}
+bool Config::getKeepAwake() const {return getBoolean("keep_awake");}
 
 
 void Config::setPaused(bool paused) {

src/fah/client/Config.h

@@ -52,6 +52,8 @@ namespace FAH {
       void setState(const cb::JSON::Value &msg);
 
       bool getOnIdle() const;
+      bool getOnBattery() const;
+      bool getKeepAwake() const;
       void setPaused(bool paused);
       bool getPaused() const;
       bool getFinish() const;

src/fah/client/Group.cpp

@@ -82,6 +82,14 @@ bool Group::waitForIdle() const {
 }
 
 
+bool Group::waitOnBattery() const {
+  return !config->getOnBattery() && app.getOS().isOnBattery();
+}
+
+
+bool Group::keepAwake() const {return config->getKeepAwake() && isActive();}
+
+
 bool Group::isActive() const {
   for (auto unit: units())
     if (!unit->isPaused()) return true;

src/fah/client/Group.h

@@ -44,8 +44,8 @@ namespace FAH {
       cb::SmartPointer<Config> config;
 
       cb::Event::EventPtr event;
-      uint32_t failures  = 0;
-      uint64_t waitUntil = 0;
+      uint32_t failures   = 0;
+      uint64_t waitUntil  = 0;
 
       std::function<void ()> shutdownCB;
 
@@ -103,6 +103,8 @@ namespace FAH {
       void setState(const cb::JSON::Value &msg);
 
       bool waitForIdle() const;
+      bool waitOnBattery() const;
+      bool keepAwake() const;
       bool isActive() const;
       bool hasUnrunWUs() const;
       void triggerUpdate();

src/fah/client/Groups.cpp

@@ -130,3 +130,12 @@ bool Groups::getPaused() const {
 
   return true;
 }
+
+
+bool Groups::keepAwake() const {
+  for (auto &name: keys())
+    if (getGroup(name).keepAwake())
+      return true;
+
+  return false;
+}

src/fah/client/Groups.h

@@ -50,6 +50,7 @@ namespace FAH {
       void triggerUpdate();
       void setState(const cb::JSON::Value &msg);
       bool getPaused() const;
+      bool keepAwake() const;
     };
   }
 }