nedko/trmnl_server_cpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed memory problems

Browse Source
This commit is contained in:
nedko
2026-06-25 16:04:56 +03:00
parent 84bc7f5d40
commit eca47d1596
3 changed files with 45 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
TRMNL.cpp
View File

@@ -1,4 +1,5 @@
#include "TRMNL.h"
#include "helpers.h"
using std::list;
using std::map;
@@ -18,6 +19,19 @@ m_refresh_rate(refresh_rate),
m_update_handler()
{}
TRMNL::TRMNL(const nlohmann::json& j)
: m_id(""),
m_api_key(""),
m_friendly_id(""),
m_refresh_rate(DEFAULT_REFRESH_RATE),
m_update_handler()
{
json_extract(j, "ID", m_id);
json_extract(j, "api_key", m_api_key);
json_extract(j, "friendly_id", m_friendly_id);
json_extract(j, "refresh_rate", m_refresh_rate);
}
const string& TRMNL::id() const
{
return m_id;
@@ -108,47 +122,6 @@ void to_json(json& j, const TRMNL& trmnl)
};
}
void from_json(const json& j, TRMNL& trmnl)
{
bool updated = false;
try
{
j.at("ID").get_to(trmnl.m_id);
updated = true;
}
catch (const std::exception& e)
{}
try
{
j.at("api_key").get_to(trmnl.m_api_key);
updated = true;
}
catch (const std::exception& e)
{}
try
{
j.at("friendly_id").get_to(trmnl.m_friendly_id);
updated = true;
}
catch (const std::exception& e)
{}
try
{
j.at("refresh_rate").get_to(trmnl.m_refresh_rate);
updated = true;
}
catch (const std::exception& e)
{}
if (updated && trmnl.m_update_handler)
{
trmnl.m_update_handler(trmnl);
}
}
void TRMNLContainer::TRMNL_update_handler(const TRMNL& trmnl)
{
auto it = m_by_id.find(trmnl.m_id);
@@ -164,6 +137,20 @@ void TRMNLContainer::TRMNL_update_handler(const TRMNL& trmnl)
}
}
TRMNLContainer& TRMNLContainer::operator=(const TRMNLContainer& other)
{
m_devices = other.m_devices;
m_by_id = other.m_by_id;
m_by_friendly = other.m_by_friendly;
for (TRMNL& device : m_devices)
{
device.set_update_handler([this](const TRMNL& trmnl){ TRMNL_update_handler(trmnl); });
}
return *this;
}
void TRMNLContainer::add_device(TRMNL trmnl)
{
if (trmnl.m_id.empty())
@@ -171,7 +158,6 @@ void TRMNLContainer::add_device(TRMNL trmnl)
return;
}
trmnl.set_update_handler([this](const TRMNL& trmnl){ TRMNL_update_handler(trmnl); });
auto it = m_devices.insert(m_devices.end(), trmnl);
m_by_id[trmnl.m_id] = it;
@@ -180,6 +166,8 @@ void TRMNLContainer::add_device(TRMNL trmnl)
{
m_by_friendly[trmnl.m_friendly_id] = it;
}
it->set_update_handler([this](const TRMNL& trmnl){ TRMNL_update_handler(trmnl); });
}
TRMNL* TRMNLContainer::get_device_by_id(const string& id)
@@ -217,16 +205,3 @@ void to_json(json& j, const TRMNLContainer& cont)
{
j = cont.m_devices;
}
void from_json(const json& j, TRMNLContainer& cont)
{
if (!j.is_array())
{
return;
}
for (int i = 0; i < j.size(); ++i)
{
cont.add_device(j[i]);
}
}