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

[DeckStorage] Summarize batch publish failures when the batch drains

Browse source 
Each rejected node stacked its own modal dialog, so publishing a ten-deck
selection against a rejecting server made the user dismiss ten dialogs one
at a time. Failures are now collected while the batch is in flight and shown
as a single summary when the visibility refresh timer fires; a reply that
lands outside an active batch still reports right away.
This commit is contained in:
Lukas Brübach 2026-09-19 07:47:21 +02:00 • committed by GitHub
parent e3a3ce0521
commit 64e0b2bbee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

30
cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
View file

@ -44,7 +44,8 @@
#include <libcockatrice/settings/paths_settings.h> #include <libcockatrice/settings/paths_settings.h>
#include <libcockatrice/utility/string_limits.h> #include <libcockatrice/utility/string_limits.h>
namespace { namespace
{
// How long to wait after the last visibility change before reading back the // How long to wait after the last visibility change before reading back the
// Public/Private column, in milliseconds. // Public/Private column, in milliseconds.
constexpr int VISIBILITY_REFRESH_DELAY = 500; constexpr int VISIBILITY_REFRESH_DELAY = 500;
@ -860,6 +861,7 @@ void TabDeckStorage::onShareFromTreeTimeout()
void TabDeckStorage::actPublishDeck() void TabDeckStorage::actPublishDeck()
{ {
visibilityFailures.clear();
const auto selection = serverDirView->getCurrentSelection(); const auto selection = serverDirView->getCurrentSelection();
for (const auto *node : selection) { for (const auto *node : selection) {
Command_DeckSetVisibility cmd; Command_DeckSetVisibility cmd;
@ -889,15 +891,33 @@ void TabDeckStorage::actPublishDeck()
void TabDeckStorage::setVisibilityFinished(const Response &r, const CommandContainer & /*commandContainer*/) void TabDeckStorage::setVisibilityFinished(const Response &r, const CommandContainer & /*commandContainer*/)
{ {
if (r.response_code() != Response::RespOk) { if (r.response_code() == Response::RespOk) {
QMessageBox::critical(this, tr("Error"), if (visibilityRefreshStarted) {
tr("Failed to change deck visibility on server (response code %1).") visibilityRefreshTimer->start();
.arg(QString::number(static_cast<int>(r.response_code())))); }
return;
}
// Collect batch failures and surface them once, when publishing quiets
// down, instead of stacking one modal dialog per rejected node.
const QString message = tr("Failed to change deck visibility on server (response code %1).")
.arg(QString::number(static_cast<int>(r.response_code())));
if (visibilityRefreshStarted) {
visibilityFailures.append(message);
visibilityRefreshTimer->start();
} else {
QMessageBox::critical(this, tr("Error"), message);
} }
} }
void TabDeckStorage::onVisibilityRefreshTimeout() void TabDeckStorage::onVisibilityRefreshTimeout()
{ {
visibilityRefreshStarted = false; visibilityRefreshStarted = false;
if (!visibilityFailures.isEmpty()) {
QMessageBox::critical(
this, tr("Error"),
tr("Failed to change the visibility of %n selected deck(s).", "", visibilityFailures.size()));
visibilityFailures.clear();
}
serverDirView->refreshTree(); serverDirView->refreshTree();
} }

2
cockatrice/src/interface/widgets/tabs/tab_deck_storage.h
View file

@ -11,6 +11,7 @@
#include "../interface/widgets/server/remote/remote_decklist_tree_widget.h" #include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
#include "tab.h" #include "tab.h"
#include <QStringList>
#include <libcockatrice/network/client/abstract/abstract_client.h> #include <libcockatrice/network/client/abstract/abstract_client.h>
struct LoadedDeck; struct LoadedDeck;
@ -47,6 +48,7 @@ private:
QAction *aOpenRemoteDeck, *aDownload, *aShareDecks, *aPublishDeck, *aNewFolder, *aDeleteRemoteDeck; QAction *aOpenRemoteDeck, *aDownload, *aShareDecks, *aPublishDeck, *aNewFolder, *aDeleteRemoteDeck;
bool visibilityRefreshStarted = false; bool visibilityRefreshStarted = false;
QTimer *visibilityRefreshTimer; QTimer *visibilityRefreshTimer;
QStringList visibilityFailures;
QString getTargetPath() const; QString getTargetPath() const;
void setRemoteEnabled(bool enabled); void setRemoteEnabled(bool enabled);