Add documentation, start extending serialization

Temperature sensors are still missing

app/include/Serializer.h

@@ -17,9 +17,13 @@ using json = nlohmann::json;
 class Serializer {
 public:
   Serializer();
-  void Serialize(std::vector<std::shared_ptr<Fan>> fans);
+  void SerializeFans(std::vector<std::shared_ptr<Fan>> fans);
   std::vector<std::shared_ptr<Fan>>
-  Deserialize(std::vector<std::shared_ptr<Sensor>> availableSensors);
+  DeserializeFans(std::vector<std::shared_ptr<Sensor>> availableSensors);
+
+  void SerializeTempSensors(std::vector<std::shared_ptr<Sensor>> senors);
+  std::vector<std::shared_ptr<Sensor>>
+  DeserializeTempSensors(std::vector<std::shared_ptr<Sensor>> availableSensors);
 
 private:
   void WriteJson(json o);

app/src/Serializer.cxx

@@ -18,22 +18,18 @@ Serializer::Serializer() {
   }
 }
 
-void Serializer::Serialize(vector<shared_ptr<Fan>> fans) {
-  json fansArr;
-
-  for (auto f : fans) {
-    fansArr.emplace_back(f->toJson());
-  }
-
+void Serializer::SerializeFans(vector<shared_ptr<Fan>> fans) {
   json obj;
 
-  obj["fans"] = fansArr;
+  for (auto f : fans) {
+    obj["fans"].push_back(f->toJson());
+  }
 
   WriteJson(obj);
 }
 
 vector<shared_ptr<Fan>>
-Serializer::Deserialize(vector<shared_ptr<Sensor>> availableSensors) {
+Serializer::DeserializeFans(vector<shared_ptr<Sensor>> availableSensors) {
   vector<shared_ptr<Fan>> mapping;
 
   // Create a for the sensors first, then searching becomes cheaper
@@ -57,11 +53,35 @@ Serializer::Deserialize(vector<shared_ptr<Sensor>> availableSensors) {
 }
 
 void Serializer::WriteJson(json o) {
+  json obj;
+
+  if (fs::exists(fs::path(SERIALIZATION_DIR) / FANS_JSON_FILENAME)) {
+    auto obj = ReadJson();
+  }
+
+  for (auto &[key, value] : o.items()) {
+    obj[key] = value;
+  }
+
   ofstream ostrm(fs::path(SERIALIZATION_DIR) / FANS_JSON_FILENAME, ios::trunc);
-  ostrm << o.dump(2) << "\n";
+  ostrm << obj.dump(2) << "\n";
 }
 
 json Serializer::ReadJson() {
   ifstream istrm(fs::path(SERIALIZATION_DIR) / FANS_JSON_FILENAME);
   return json::parse(istrm);
 }
+
+void Serializer::SerializeTempSensors(vector<shared_ptr<Sensor>> sensors) {
+  json obj;
+
+  for (auto s : sensors) {
+    obj["tempSensors"].push_back(s->toJson());
+  }
+
+  WriteJson(obj);
+}
+vector<shared_ptr<Sensor>>
+DeserializeTempSensors(vector<shared_ptr<Sensor>> availableSensors) {
+  return vector<shared_ptr<Sensor>>();
+}

app/src/main.cxx

@@ -26,10 +26,10 @@ int main() {
   std::vector<std::shared_ptr<Fan>> fans;
 
   if (fs::exists(fs::path(SERIALIZATION_DIR) / FANS_JSON_FILENAME)) {
-    fans = s.Deserialize(pwmSensors);
+    fans = s.DeserializeFans(pwmSensors);
   } else {
     fans = m.createMapping(pwmSensors, controls);
-    s.Serialize(fans);
+    s.SerializeFans(fans);
   }
 
   for (auto f : fans) {