load toxcore settings from conf like totato does
Some checks failed
ContinuousDelivery / linux-ubuntu (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android]) (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android]) (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android]) (push) Has been cancelled
ContinuousDelivery / windows (push) Has been cancelled
ContinuousDelivery / windows-asan (push) Has been cancelled
ContinuousIntegration / linux (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android]) (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android]) (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android]) (push) Has been cancelled
ContinuousIntegration / macos (push) Has been cancelled
ContinuousIntegration / windows (push) Has been cancelled
ContinuousDelivery / dumpsyms (push) Has been cancelled
ContinuousDelivery / release (push) Has been cancelled

add ui in startup to configure the core for this run
other start screen improvements
This commit is contained in:
Green Sky
2025-02-06 19:47:48 +01:00
parent ce0ff0bea9
commit bfbeafddf7
5 changed files with 246 additions and 92 deletions

View File

@@ -2,6 +2,7 @@
// meh, change this
#include <exception>
#include <memory>
#include <system_error>
#include <tox/toxencryptsave.h>
@@ -18,12 +19,13 @@ static void eee(std::string& mod) {
}
}
ToxClient::ToxClient(std::string_view save_path, std::string_view save_password) :
ToxClient::ToxClient(ConfigModelI& conf, std::string_view save_path, std::string_view save_password) :
_tox_profile_path(save_path), _tox_profile_password(save_password)
{
TOX_ERR_OPTIONS_NEW err_opt_new;
Tox_Options* options = tox_options_new(&err_opt_new);
std::unique_ptr<Tox_Options, decltype(&tox_options_free)> options {tox_options_new(&err_opt_new), &tox_options_free};
assert(err_opt_new == TOX_ERR_OPTIONS_NEW::TOX_ERR_OPTIONS_NEW_OK);
std::string tmp_proxy_host; // the string needs to survive until options is freed
std::vector<uint8_t> profile_data{};
if (!_tox_profile_path.empty()) {
@@ -59,19 +61,55 @@ ToxClient::ToxClient(std::string_view save_path, std::string_view save_password)
}
eee(_tox_profile_password);
}
tox_options_set_savedata_type(options, TOX_SAVEDATA_TYPE_TOX_SAVE);
tox_options_set_savedata_data(options, profile_data.data(), profile_data.size());
tox_options_set_savedata_type(options.get(), TOX_SAVEDATA_TYPE_TOX_SAVE);
tox_options_set_savedata_data(options.get(), profile_data.data(), profile_data.size());
}
ifile.close(); // do i need this?
}
}
tox_options_set_experimental_groups_persistence(options, true);
tox_options_set_ipv6_enabled(options.get(), conf.get_bool("tox", "ipv6_enabled").value_or(true));
tox_options_set_udp_enabled(options.get(), conf.get_bool("tox", "udp_enabled").value_or(true));
tox_options_set_local_discovery_enabled(options.get(), conf.get_bool("tox", "local_discovery_enabled").value_or(true));
//tox_options_set_dht_announcements_enabled(options.get(), conf.get_bool("tox", "dht_announcements_enabled").value_or(true));
tox_options_set_dht_announcements_enabled(options.get(), true); // dont harm the network
const size_t proxy_conf_sum = conf.has_string("tox", "proxy_type")
+ conf.has_string("tox", "proxy_host")
+ conf.has_int("tox", "proxy_port")
;
// if all proxy parts defined
if (proxy_conf_sum == 3) {
const std::string_view proxy_type_str = conf.get_string("tox", "proxy_type").value();
if (proxy_type_str == "HTTP") {
tox_options_set_proxy_type(options.get(), Tox_Proxy_Type::TOX_PROXY_TYPE_HTTP);
} else if (proxy_type_str == "SOCKS5") {
tox_options_set_proxy_type(options.get(), Tox_Proxy_Type::TOX_PROXY_TYPE_SOCKS5);
} else {
throw std::runtime_error("invalid proxy type in config");
}
tmp_proxy_host = conf.get_string("tox", "proxy_host").value();
tox_options_set_proxy_host(options.get(), tmp_proxy_host.c_str());
tox_options_set_proxy_port(options.get(), conf.get_int("tox", "proxy_port").value());
} else if (proxy_conf_sum > 0) {
throw std::runtime_error("config only partly specified proxy");
}
tox_options_set_start_port(options.get(), conf.get_int("tox", "start_port").value_or(0));
tox_options_set_end_port(options.get(), conf.get_int("tox", "end_port").value_or(0));
tox_options_set_tcp_port(options.get(), conf.get_int("tox", "tcp_port").value_or(0));
tox_options_set_hole_punching_enabled(options.get(), conf.get_bool("tox", "hole_punching_enabled").value_or(true));
tox_options_set_experimental_groups_persistence(options.get(), true);
// annoyingly the inverse
tox_options_set_experimental_disable_dns(options.get(), !conf.get_bool("tox", "dns").value_or(false));
Tox_Err_New err_new;
_tox = tox_new(options, &err_new);
tox_options_free(options);
_tox = tox_new(options.get(), &err_new);
if (err_new != TOX_ERR_NEW_OK) {
std::cerr << "tox_new failed with error code " << err_new << "\n";
throw std::runtime_error{std::string{"toxcore creation failed with '"} + tox_err_new_to_string(err_new) + "'"};