Creepso/litucks-torzu
1
0
Fork 0
mirror of https://notabug.org/litucks/torzu.git synced 2026-05-25 01:22:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor

Browse source
This commit is contained in:
spectranator 2024-07-26 17:35:38 +02:00
parent c43b256492
commit 67ca7ae54d
3 changed files with 36 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

146
src/yuzu/configuration/configure_web.cpp
View file

@ -5,46 +5,15 @@
#include <QMessageBox>
#include <QtConcurrent/QtConcurrentRun>
#include "common/settings.h"
#include "common/uuid.h"
#include "ui_configure_web.h"
#include "yuzu/configuration/configure_web.h"
#include "yuzu/uisettings.h"
static constexpr char token_delimiter{':'};
static std::string GetGeneratedTokenCode()
{
using std::chrono::system_clock;
return std::string("token-") + std::string(std::to_string(std::chrono::system_clock::now().time_since_epoch().count()));
}
static std::string GenerateDisplayToken(const std::string& username, const std::string& token) {
if (username.empty() || token.empty()) {
return {};
}
const std::string unencoded_display_token{username + token_delimiter + token};
QByteArray b{unencoded_display_token.c_str()};
QByteArray b64 = b.toBase64();
return b64.toStdString();
}
static std::string UsernameFromDisplayToken(const std::string& display_token) {
const std::string unencoded_display_token{
QByteArray::fromBase64(display_token.c_str()).toStdString()};
return unencoded_display_token.substr(0, unencoded_display_token.find(token_delimiter));
}
static std::string TokenFromDisplayToken(const std::string& display_token) {
const std::string unencoded_display_token{
QByteArray::fromBase64(display_token.c_str()).toStdString()};
return unencoded_display_token.substr(unencoded_display_token.find(token_delimiter) + 1);
}
ConfigureWeb::ConfigureWeb(QWidget* parent)
: QWidget(parent), ui(std::make_unique<Ui::ConfigureWeb>()) {
ui->setupUi(this);
connect(ui->button_verify_login, &QPushButton::clicked, this, &ConfigureWeb::VerifyLogin);
connect(&verify_watcher, &QFutureWatcher<bool>::finished, this, &ConfigureWeb::OnLoginVerified);
connect(ui->button_reset_token, &QPushButton::clicked, this, &ConfigureWeb::ResetToken);
#ifndef USE_DISCORD_PRESENCE
ui->discord_group->setVisible(false);
@ -66,126 +35,53 @@ void ConfigureWeb::changeEvent(QEvent* event) {
void ConfigureWeb::RetranslateUI() {
ui->retranslateUi(this);
ui->web_signup_link->setText(
tr("<a href='UNUSED'><span style=\"text-decoration: underline; "
"color:#039be5;\">Sign up</span></a>"));
ui->web_token_info_link->setText(
tr("<a href='UNUSED'><span style=\"text-decoration: "
"underline; color:#039be5;\">What is my token?</span></a>"));
}
void ConfigureWeb::SetConfiguration() {
ui->web_credentials_disclaimer->setWordWrap(true);
ui->web_signup_link->setOpenExternalLinks(true);
ui->web_token_info_link->setOpenExternalLinks(true);
if (Settings::values.yuzu_username.GetValue().empty()) {
ui->username->setText(tr("Unspecified"));
} else {
ui->username->setText(QString::fromStdString(Settings::values.yuzu_username.GetValue()));
}
ui->edit_token->setText(QString::fromStdString(GenerateDisplayToken(
Settings::values.yuzu_username.GetValue(), Settings::values.yuzu_token.GetValue())));
// Connect after setting the values, to avoid calling OnLoginChanged now
connect(ui->edit_token, &QLineEdit::textChanged, this, &ConfigureWeb::OnLoginChanged);
user_verified = true;
ui->edit_token->setText(QString::fromStdString(Settings::values.yuzu_token.GetValue()));
ui->toggle_discordrpc->setChecked(UISettings::values.enable_discord_presence.GetValue());
ui->web_signup_link->setVisible(false);
ui->web_token_info_link->setVisible(false);
}
void ConfigureWeb::ApplyConfiguration() {
UISettings::values.enable_discord_presence = ui->toggle_discordrpc->isChecked();
if (user_verified) {
if (Settings::values.yuzu_username.GetValue().empty()) {
// backup: default name should already be set by ConfigureProfileManager::UpdateCurrentUser()
Settings::values.yuzu_username = "torzu";
} else {
// if a name already exist, reassign it to itself (needed for change set with a profile switch)
Settings::values.yuzu_username = Settings::values.yuzu_username.GetValue();
}
if (Settings::values.yuzu_token.GetValue().empty()) {
// if empty, automatically generate a new one
Settings::values.yuzu_token = GetGeneratedTokenCode();
} else {
// if already exists, use that value
Settings::values.yuzu_token = TokenFromDisplayToken(ui->edit_token->text().toStdString());
}
if (Settings::values.yuzu_username.GetValue().empty()) {
// Backup: default name should already be set by ConfigureProfileManager::UpdateCurrentUser()
Settings::values.yuzu_username = "torzu";
} else {
QMessageBox::warning(
this, tr("Token not verified"),
tr("Token was not verified. The change to your token has not been saved."));
// If a name already exist, reassign it to itself (needed for change set with a profile switch)
Settings::values.yuzu_username = Settings::values.yuzu_username.GetValue();
}
}
void ConfigureWeb::OnLoginChanged() {
if (ui->edit_token->text().isEmpty()) {
user_verified = true;
// Empty = no icon
ui->label_token_verified->setPixmap(QPixmap());
ui->label_token_verified->setToolTip(QString());
// If no token specified, automatically generate one
Settings::values.yuzu_token = Common::UUID::MakeRandom().FormattedString();
} else {
user_verified = false;
// Show an info icon if it's been changed, clearer than showing failure
const QPixmap pixmap = QIcon::fromTheme(QStringLiteral("info")).pixmap(16);
ui->label_token_verified->setPixmap(pixmap);
ui->label_token_verified->setToolTip(
tr("Unverified, please click Verify before saving configuration", "Tooltip"));
// Otherwise use user-specified value
Settings::values.yuzu_token = ui->edit_token->text().toStdString();
}
}
// repurposed for resetting token
void ConfigureWeb::VerifyLogin() {
// ORIGINAL CODE FOR THIS FUNCTION
//ui->button_verify_login->setDisabled(true);
//ui->button_verify_login->setText(tr("Verifying..."));
//ui->label_token_verified->setPixmap(QIcon::fromTheme(QStringLiteral("sync")).pixmap(16));
//ui->label_token_verified->setToolTip(tr("Verifying..."));
//verify_watcher.setFuture(QtConcurrent::run(
// [username = UsernameFromDisplayToken(ui->edit_token->text().toStdString()),
// token = TokenFromDisplayToken(ui->edit_token->text().toStdString())] {
// return Core::VerifyLogin(username, token);
// }));
// END ORIGINAL CODE
// set a new token
Settings::values.yuzu_token = GetGeneratedTokenCode();
// just to display the label_token_verified pic and tooltip for visual confirmation
OnLoginVerified();
// apply the changes
void ConfigureWeb::ResetToken() {
// Generate and set token
const auto token = Common::UUID::MakeRandom().FormattedString();
Settings::values.yuzu_token = token;
// Just to display the label_token_icon pic and tooltip for visual confirmation
ui->label_token_icon->setPixmap(QIcon::fromTheme(QStringLiteral("checked")).pixmap(16));
ui->label_token_icon->setToolTip(tr("Token Changed", "Tooltip"));
ui->username->setText(QString::fromStdString(token));
// Apply the changes
SetConfiguration();
}
void ConfigureWeb::OnLoginVerified() {
//ui->button_verify_login->setEnabled(true);
//ui->button_verify_login->setText(tr("Verify"));
if (true) { //(verify_watcher.result()) {
user_verified = true;
ui->label_token_verified->setPixmap(QIcon::fromTheme(QStringLiteral("checked")).pixmap(16));
ui->label_token_verified->setToolTip(tr("Token Changed", "Tooltip"));
ui->username->setText(
QString::fromStdString(UsernameFromDisplayToken(ui->edit_token->text().toStdString())));
} else {
ui->label_token_verified->setPixmap(QIcon::fromTheme(QStringLiteral("failed")).pixmap(16));
ui->label_token_verified->setToolTip(tr("Verification failed", "Tooltip"));
ui->username->setText(tr("Unspecified"));
QMessageBox::critical(this, tr("Verification failed"),
tr("Verification failed. Check that you have entered your token "
"correctly, and that your internet connection is working."));
}
}
void ConfigureWeb::SetWebServiceConfigEnabled(bool enabled) {
ui->label_disable_info->setVisible(!enabled);
ui->groupBoxWebConfig->setEnabled(enabled);

7
src/yuzu/configuration/configure_web.h
View file

@ -25,14 +25,9 @@ private:
void changeEvent(QEvent* event) override;
void RetranslateUI();
void OnLoginChanged();
void VerifyLogin();
void OnLoginVerified();
void ResetToken();
void SetConfiguration();
bool user_verified = true;
QFutureWatcher<bool> verify_watcher;
std::unique_ptr<Ui::ConfigureWeb> ui;
};

21
src/yuzu/configuration/configure_web.ui
View file

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>926</width>
<width>2280</width>
<height>561</height>
</rect>
</property>
@ -28,14 +28,14 @@
<item>
<widget class="QLabel" name="web_credentials_disclaimer">
<property name="text">
<string>Tokens for hosting public rooms in a lobby are automatically generated the first time you save Configuration settings. To change the token username, switch to a different profile under the System >> Profiles tab. If you have already opened the multiplayer lobby, exit and restart the emulator for the name change to apply there. To generate a new token for any reason, use the "Reset Token" button.</string>
<string>This token is for hosting public rooms in a lobby and are automatically generated the first time you save settings. To change your username, rename or switch the profile. If you are currently connected to multiplayer, exit and restart the emulator for changes to apply.</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayoutYuzuUsername">
<item row="2" column="3">
<widget class="QPushButton" name="button_verify_login">
<widget class="QPushButton" name="button_reset_token">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -52,6 +52,9 @@
</item>
<item row="2" column="0">
<widget class="QLabel" name="web_signup_link">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Sign up</string>
</property>
@ -68,7 +71,11 @@
</widget>
</item>
<item row="1" column="4">
<widget class="QLabel" name="label_token_verified"/>
<widget class="QLabel" name="label_token_icon">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_username">
@ -82,13 +89,13 @@
<property name="maxLength">
<number>80</number>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="web_token_info_link">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>What is my token?</string>
</property>