Updates for cbang API changes

FoldingAtHome · Mar 17, 2024 · c1995a1 · c1995a1
1 parent a8c8006
commit c1995a1
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/src/fah/client/Account.cpp b/src/fah/client/Account.cpp
@@ -89,7 +89,7 @@ void Account::init() {
   auto &db = app.getDB("config");
 
   if (db.has("account"))
-    setData(JSON::Reader::parseString(db.getString("account")));
+    setData(JSON::Reader::parse(db.getString("account")));
 }
 
 
@@ -246,7 +246,7 @@ void Account::onEncrypted(const JSON::ValuePtr &_msg) {
   if (4e6 < ivs.size()) THROW("Too many IVs");
 
   Cipher cipher("aes-256-cbc", false, sessionKey.data(), iv.data());
-  JSON::ValuePtr msg = JSON::Reader::parseString(cipher.crypt(payload));
+  JSON::ValuePtr msg = JSON::Reader::parse(cipher.crypt(payload));
 
   LOG_DEBUG(5, *msg);
 

diff --git a/src/fah/client/App.cpp b/src/fah/client/App.cpp
@@ -441,7 +441,7 @@ void App::loadConfig() {
 
   // Global config
   auto &r       = FAH::Client::resource0.get("global.json");
-  auto defaults = JSON::Reader::parseString(r.toString());
+  auto defaults = JSON::Reader::parse(InputSource(r));
   SmartPointer<Config> config = new Config(*this, defaults);
 
   config->load(getOptions());

diff --git a/src/fah/client/GPUResources.cpp b/src/fah/client/GPUResources.cpp
@@ -115,7 +115,7 @@ void GPUResources::update() {
     bool fail = true;
 
     try {
-      load(*JSON::Reader::parse(filename));
+      load(*JSON::Reader::parseFile(filename));
       fail = false;
     } CATCH_ERROR;
 

diff --git a/src/fah/client/Group.cpp b/src/fah/client/Group.cpp
@@ -51,7 +51,7 @@ Group::Group(App &app, const string &name) :
   app(app), name(name),
   event(app.getEventBase().newEvent(this, &Group::update, 0)) {
   auto &r       = FAH::Client::resource0.get("group.json");
-  auto defaults = JSON::Reader::parseString(r.toString());
+  auto defaults = JSON::Reader::parse(r);
   config        = new Config(app, defaults);
   auto &db      = app.getDB("groups");
 

diff --git a/src/fah/client/Unit.cpp b/src/fah/client/Unit.cpp
@@ -703,7 +703,7 @@ void Unit::readViewerTop() {
   string filename = getDirectory() + "/viewerTop.json";
 
   if (existsAndOlderThan(filename, 10)) {
-    topology = JSON::Reader(filename).parse();
+    topology = JSON::Reader::parseFile(filename);
     frames.clear();
   }
 }
@@ -714,7 +714,7 @@ bool Unit::readViewerFrame() {
     getDirectory() + String::printf("/viewerFrame%d.json", viewerFrame);
 
   if (existsAndOlderThan(filename, 10)) {
-    auto frame = JSON::Reader(filename).parse();
+    auto frame = JSON::Reader::parseFile(filename);
 
     if (!frames.empty() && *frames.back() == *frame)
       LOG_WARNING("Visualization frame " << viewerFrame
@@ -1062,7 +1062,7 @@ void Unit::downloadResponse(const JSON::ValuePtr &data) {
     SystemUtilities::ensureDirectory(getDirectory());
 
     auto f = SystemUtilities::oopen(getDirectory() + "/wudata_01.dat");
-    f->write(wuData.c_str(), wuData.length());
+    f->write(wuData.data(), wuData.length());
   }
 
   setState(UNIT_CORE);

diff --git a/src/fah/client/Units.cpp b/src/fah/client/Units.cpp
@@ -49,7 +49,7 @@ Units::Units(App &app) {
   app.getDB("units").foreach(
     [this, &app, &clientID, &count] (const string &id, const string &data) {
       try {
-        auto unit = SmartPtr(new Unit(app, JSON::Reader::parseString(data)));
+        auto unit = SmartPtr(new Unit(app, JSON::Reader::parse(data)));
 
         if (unit->getClientID() == clientID) {add(unit); count++;}
         else LOG_ERROR("WU with client ID " << unit->getClientID()