Green-Sky/totato
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve tox client (prevent excessive saving)

Browse Source 
and reorder construction/destruction order of plugin manager in main
This commit is contained in:
Green Sky 2024-04-10 12:06:11 +02:00
parent 4b39541d93
commit 4b7ef79f38
No known key found for this signature in database
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main.cpp
View File

@ -198,7 +198,6 @@ int main(int argc, char** argv) {
} }
PluginManager pm;
ToxEventLogger tel{std::cout}; // TODO: config ToxEventLogger tel{std::cout}; // TODO: config
@ -222,6 +221,8 @@ int main(int argc, char** argv) {
ToxMessageManager tmm{rmm, cr, tcm, tc, tc}; ToxMessageManager tmm{rmm, cr, tcm, tc, tc};
ToxTransferManager ttm{rmm, cr, tcm, tc, tc}; ToxTransferManager ttm{rmm, cr, tcm, tc, tc};
PluginManager pm;
{ // setup plugin instances { // setup plugin instances
g_provideInstance<ConfigModelI>("ConfigModelI", "host", &conf); g_provideInstance<ConfigModelI>("ConfigModelI", "host", &conf);
g_provideInstance<Contact3Registry>("Contact3Registry", "1", "host", &cr); g_provideInstance<Contact3Registry>("Contact3Registry", "1", "host", &cr);
@ -313,7 +314,7 @@ int main(int argc, char** argv) {
const bool tick = time_delta_tick >= last_min_interval; const bool tick = time_delta_tick >= last_min_interval;
if (tick) { if (tick) {
quit = !tc.iterate(); quit = !tc.iterate(time_delta_tick);
tcm.iterate(time_delta_tick); tcm.iterate(time_delta_tick);
ttm.iterate(); ttm.iterate();

9
src/tox_client.cpp
View File

@ -155,10 +155,13 @@ ToxClient::ToxClient(ConfigModelI& conf, std::string_view save_path, std::string
} }
ToxClient::~ToxClient(void) { ToxClient::~ToxClient(void) {
if (_tox_profile_dirty) {
saveToxProfile();
}
tox_kill(_tox); tox_kill(_tox);
} }
bool ToxClient::iterate(void) { bool ToxClient::iterate(float time_delta) {
Tox_Err_Events_Iterate err_e_it = TOX_ERR_EVENTS_ITERATE_OK; Tox_Err_Events_Iterate err_e_it = TOX_ERR_EVENTS_ITERATE_OK;
auto* events = tox_events_iterate(_tox, false, &err_e_it); auto* events = tox_events_iterate(_tox, false, &err_e_it);
if (err_e_it == TOX_ERR_EVENTS_ITERATE_OK && events != nullptr) { if (err_e_it == TOX_ERR_EVENTS_ITERATE_OK && events != nullptr) {
@ -170,7 +173,8 @@ bool ToxClient::iterate(void) {
tox_events_free(events); tox_events_free(events);
if (_tox_profile_dirty) { _save_heat -= time_delta;
if (_tox_profile_dirty && _save_heat <= 0.f) {
saveToxProfile(); saveToxProfile();
} }
@ -214,5 +218,6 @@ void ToxClient::saveToxProfile(void) {
} }
_tox_profile_dirty = false; _tox_profile_dirty = false;
_save_heat = 10.f;
} }

4
src/tox_client.hpp
View File

@ -24,6 +24,7 @@ class ToxClient : public ToxDefaultImpl, public ToxEventProviderBase {
std::string _tox_profile_path; std::string _tox_profile_path;
std::string _tox_profile_password; std::string _tox_profile_password;
bool _tox_profile_dirty {true}; // set in callbacks bool _tox_profile_dirty {true}; // set in callbacks
float _save_heat {0.f};
public: public:
ToxClient(ConfigModelI& conf, std::string_view save_path, std::string_view save_password); ToxClient(ConfigModelI& conf, std::string_view save_path, std::string_view save_password);
@ -35,7 +36,7 @@ class ToxClient : public ToxDefaultImpl, public ToxEventProviderBase {
void setDirty(void) { _tox_profile_dirty = true; } void setDirty(void) { _tox_profile_dirty = true; }
// returns false when we shoul stop the program // returns false when we shoul stop the program
bool iterate(void); bool iterate(float time_delta);
void stop(void); // let it know it should exit void stop(void); // let it know it should exit
void setToxProfilePath(const std::string& new_path) { _tox_profile_path = new_path; } void setToxProfilePath(const std::string& new_path) { _tox_profile_path = new_path; }
@ -48,4 +49,3 @@ class ToxClient : public ToxDefaultImpl, public ToxEventProviderBase {
void saveToxProfile(void); void saveToxProfile(void);
}; };