jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Lint some thangs.

Browse source
This commit is contained in:
Lukas Brübach 2025-04-18 01:29:12 +02:00
parent 7f69f83046
commit 92ba0e5a05
2 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

50
cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
View file

@ -14,8 +14,6 @@ EdhrecCommanderApiResponseNavigationWidget::EdhrecCommanderApiResponseNavigation
gameChangerLabel = new QLabel(this); gameChangerLabel = new QLabel(this);
budgetLabel = new QLabel(this); budgetLabel = new QLabel(this);
commanderDetails.debugPrint();
comboPushButton = new QPushButton(this); comboPushButton = new QPushButton(this);
averageDeckPushButton = new QPushButton(this); averageDeckPushButton = new QPushButton(this);
@ -27,10 +25,10 @@ EdhrecCommanderApiResponseNavigationWidget::EdhrecCommanderApiResponseNavigation
for (int i = 0; i < gameChangerOptions.length(); i++) { for (int i = 0; i < gameChangerOptions.length(); i++) {
QString option = gameChangerOptions.at(i); QString option = gameChangerOptions.at(i);
QString label = option.isEmpty() ? "All" : option.at(0).toUpper() + option.mid(1); QString label = option.isEmpty() ? "All" : option.at(0).toUpper() + option.mid(1);
QPushButton *btn = new QPushButton(label, this); QPushButton *optionButton = new QPushButton(label, this);
gameChangerButtons[option] = btn; gameChangerButtons[option] = optionButton;
layout->addWidget(btn, 2, i); layout->addWidget(optionButton, 2, i);
connect(btn, &QPushButton::clicked, this, [=, this]() { connect(optionButton, &QPushButton::clicked, this, [=, this]() {
selectedGameChanger = option; selectedGameChanger = option;
updateOptionButtonSelection(gameChangerButtons, option); updateOptionButtonSelection(gameChangerButtons, option);
actRequestCommanderNavigation(); actRequestCommanderNavigation();
@ -91,10 +89,12 @@ void EdhrecCommanderApiResponseNavigationWidget::applyOptionsFromUrl(const QStri
QString cleanedUrl = url; QString cleanedUrl = url;
// Remove base and file extension // Remove base and file extension
if (cleanedUrl.startsWith("https://json.edhrec.com/pages/")) if (cleanedUrl.startsWith("https://json.edhrec.com/pages/")) {
cleanedUrl = cleanedUrl.mid(QString("https://json.edhrec.com/pages/").length()); cleanedUrl = cleanedUrl.mid(QString("https://json.edhrec.com/pages/").length());
if (cleanedUrl.endsWith(".json")) }
if (cleanedUrl.endsWith(".json")) {
cleanedUrl.chop(5); cleanedUrl.chop(5);
}
// Expecting something like: "commanders/the-ur-dragon/core/expensive" // Expecting something like: "commanders/the-ur-dragon/core/expensive"
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
@ -103,8 +103,9 @@ void EdhrecCommanderApiResponseNavigationWidget::applyOptionsFromUrl(const QStri
QStringList parts = cleanedUrl.split('/', QString::SkipEmptyParts); QStringList parts = cleanedUrl.split('/', QString::SkipEmptyParts);
#endif #endif
if (parts.size() < 2) if (parts.size() < 2) {
return; return;
}
QString commanderName = parts[1]; QString commanderName = parts[1];
QString gameChangerOpt, budgetOpt; QString gameChangerOpt, budgetOpt;
@ -124,10 +125,12 @@ void EdhrecCommanderApiResponseNavigationWidget::applyOptionsFromUrl(const QStri
} }
// Validate and apply // Validate and apply
if (!gameChangerButtons.contains(gameChangerOpt)) if (!gameChangerButtons.contains(gameChangerOpt)) {
gameChangerOpt.clear(); gameChangerOpt.clear();
if (!budgetButtons.contains(budgetOpt)) }
if (!budgetButtons.contains(budgetOpt)) {
budgetOpt.clear(); budgetOpt.clear();
}
selectedGameChanger = gameChangerOpt; selectedGameChanger = gameChangerOpt;
selectedBudget = budgetOpt; selectedBudget = budgetOpt;
@ -144,14 +147,20 @@ void EdhrecCommanderApiResponseNavigationWidget::updateOptionButtonSelection(QMa
} }
} }
QString EdhrecCommanderApiResponseNavigationWidget::addNavigationOptionsToUrl(QString baseUrl)
{
if (!selectedGameChanger.isEmpty()) {
baseUrl += "/" + selectedGameChanger;
}
if (!selectedBudget.isEmpty()) {
baseUrl += "/" + selectedBudget;
}
return baseUrl;
}
void EdhrecCommanderApiResponseNavigationWidget::actRequestCommanderNavigation() void EdhrecCommanderApiResponseNavigationWidget::actRequestCommanderNavigation()
{ {
QString url = "/commanders/" + commanderDetails.getSanitized(); emit requestUrl(addNavigationOptionsToUrl("/commanders/" + commanderDetails.getSanitized()));
if (!selectedGameChanger.isEmpty())
url += "/" + selectedGameChanger;
if (!selectedBudget.isEmpty())
url += "/" + selectedBudget;
emit requestUrl(url);
} }
void EdhrecCommanderApiResponseNavigationWidget::actRequestComboNavigation() void EdhrecCommanderApiResponseNavigationWidget::actRequestComboNavigation()
@ -161,10 +170,5 @@ void EdhrecCommanderApiResponseNavigationWidget::actRequestComboNavigation()
void EdhrecCommanderApiResponseNavigationWidget::actRequestAverageDeckNavigation() void EdhrecCommanderApiResponseNavigationWidget::actRequestAverageDeckNavigation()
{ {
QString url = "/average-decks/" + commanderDetails.getSanitized(); emit requestUrl(addNavigationOptionsToUrl("/average-decks/" + commanderDetails.getSanitized()));
if (!selectedGameChanger.isEmpty())
url += "/" + selectedGameChanger;
if (!selectedBudget.isEmpty())
url += "/" + selectedBudget;
emit requestUrl(url);
} }

1
cockatrice/src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h
View file

@ -47,6 +47,7 @@ private:
EdhrecCommanderApiResponseCommanderDetails commanderDetails; EdhrecCommanderApiResponseCommanderDetails commanderDetails;
void updateOptionButtonSelection(QMap<QString, QPushButton *> &buttons, const QString &selectedKey); void updateOptionButtonSelection(QMap<QString, QPushButton *> &buttons, const QString &selectedKey);
QString addNavigationOptionsToUrl(QString baseUrl);
QString buildComboUrl() const; QString buildComboUrl() const;
}; };