mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-23 10:05:10 -07:00
[DeckShare] Open shared decks via links with a gated preview flow
- Serialized url-chain dispatcher in IntentUrlParser; queue-drained urlChainFinished(bool) drives the startup auto-connect fallback - Open-shared-deck intent with sequential download state machine, 15s per-item timeout, partial-success offer, livable Cancel via ApplicationModal dlg_login_prompt interactive fallback - Preview dialog: download progress label, share vocab sweep, palette-highlight selection frame, Space/Enter keyboard toggle, NoFocus checkbox, double-click tile opens immediately - Confirm-before-server-migration with one-shot restore to the previous server on failed/cancelled chains (statusChanged settle deferral), hostname-only identity comparisons - Skip credential link when already connected; arrow-key navigation in FlowWidget; card glows use palette highlight - Address code-review M1-M4 and UI/UX QA blockers 1-2
This commit is contained in:
parent
c4ffc789cd
commit
210a0fa76a
25 changed files with 1350 additions and 55 deletions
|
|
@ -45,12 +45,14 @@ set(cockatrice_SOURCES
|
||||||
src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
|
src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
|
||||||
src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
|
src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
|
||||||
src/interface/widgets/dialogs/dlg_local_game_options.cpp
|
src/interface/widgets/dialogs/dlg_local_game_options.cpp
|
||||||
|
src/interface/widgets/dialogs/dlg_login_prompt.cpp
|
||||||
src/interface/widgets/dialogs/dlg_manage_sets.cpp
|
src/interface/widgets/dialogs/dlg_manage_sets.cpp
|
||||||
src/interface/widgets/dialogs/dlg_my_reports.cpp
|
src/interface/widgets/dialogs/dlg_my_reports.cpp
|
||||||
src/interface/widgets/dialogs/dlg_register.cpp
|
src/interface/widgets/dialogs/dlg_register.cpp
|
||||||
src/interface/widgets/dialogs/dlg_report_user.cpp
|
src/interface/widgets/dialogs/dlg_report_user.cpp
|
||||||
src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
|
src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
|
||||||
src/interface/widgets/dialogs/dlg_share_deck.cpp
|
src/interface/widgets/dialogs/dlg_share_deck.cpp
|
||||||
|
src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp
|
||||||
src/interface/widgets/dialogs/dlg_settings.cpp
|
src/interface/widgets/dialogs/dlg_settings.cpp
|
||||||
src/interface/widgets/dialogs/dlg_startup_card_check.cpp
|
src/interface/widgets/dialogs/dlg_startup_card_check.cpp
|
||||||
src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
|
src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
|
||||||
|
|
@ -59,6 +61,7 @@ set(cockatrice_SOURCES
|
||||||
src/interface/widgets/dialogs/override_printing_warning.cpp
|
src/interface/widgets/dialogs/override_printing_warning.cpp
|
||||||
src/interface/widgets/dialogs/tip_of_the_day.cpp
|
src/interface/widgets/dialogs/tip_of_the_day.cpp
|
||||||
src/interface/widgets/deck_share/deck_share_utils.cpp
|
src/interface/widgets/deck_share/deck_share_utils.cpp
|
||||||
|
src/interface/widgets/deck_share/shared_deck_preview_widget.cpp
|
||||||
src/interface/widgets/deck_share/share_bar_widget.cpp
|
src/interface/widgets/deck_share/share_bar_widget.cpp
|
||||||
src/filters/deck_filter_string.cpp
|
src/filters/deck_filter_string.cpp
|
||||||
src/filters/filter_builder.cpp
|
src/filters/filter_builder.cpp
|
||||||
|
|
@ -448,6 +451,8 @@ set(cockatrice_SOURCES
|
||||||
src/interface/intents/intent_login.h
|
src/interface/intents/intent_login.h
|
||||||
src/interface/intents/intent_open_server_room_by_name.cpp
|
src/interface/intents/intent_open_server_room_by_name.cpp
|
||||||
src/interface/intents/intent_open_server_room_by_name.h
|
src/interface/intents/intent_open_server_room_by_name.h
|
||||||
|
src/interface/intents/intent_open_shared_deck.cpp
|
||||||
|
src/interface/intents/intent_open_shared_deck.h
|
||||||
src/interface/intents/url_parser.cpp
|
src/interface/intents/url_parser.cpp
|
||||||
src/interface/intents/url_parser.h
|
src/interface/intents/url_parser.h
|
||||||
src/interface/widgets/server/user/user_info_popup.cpp
|
src/interface/widgets/server/user/user_info_popup.cpp
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
#ifndef COCKATRICE_CONTEXT_OPEN_DECK_H
|
||||||
|
#define COCKATRICE_CONTEXT_OPEN_DECK_H
|
||||||
|
|
||||||
|
#include "context_connect_to_server.h"
|
||||||
|
|
||||||
|
#include <QString>
|
||||||
|
|
||||||
|
struct ContextOpenDeck
|
||||||
|
{
|
||||||
|
ContextConnectToServer serverContext;
|
||||||
|
QString shareToken;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // COCKATRICE_CONTEXT_OPEN_DECK_H
|
||||||
|
|
@ -2,10 +2,11 @@
|
||||||
|
|
||||||
Intent::Intent(QObject *parent) : QObject(parent)
|
Intent::Intent(QObject *parent) : QObject(parent)
|
||||||
{
|
{
|
||||||
// An intent is done as soon as it reports success or failure. Deleting it
|
// An intent is done as soon as it reports success, failure, or cancellation.
|
||||||
// also tears down its dependency chain and disconnects any signal wiring.
|
// Deleting it also tears down its dependency chain and disconnects any signal wiring.
|
||||||
connect(this, &Intent::finished, this, &QObject::deleteLater);
|
connect(this, &Intent::finished, this, &QObject::deleteLater);
|
||||||
connect(this, &Intent::failed, this, &QObject::deleteLater);
|
connect(this, &Intent::failed, this, &QObject::deleteLater);
|
||||||
|
connect(this, &Intent::cancelled, this, &QObject::deleteLater);
|
||||||
}
|
}
|
||||||
|
|
||||||
Intent::~Intent() = default;
|
Intent::~Intent() = default;
|
||||||
|
|
@ -46,3 +47,11 @@ void Intent::emitFailed(const QString &reason)
|
||||||
emit failed(reason);
|
emit failed(reason);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Intent::emitCancelled()
|
||||||
|
{
|
||||||
|
if (!completed) {
|
||||||
|
completed = true;
|
||||||
|
emit cancelled();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ public:
|
||||||
signals:
|
signals:
|
||||||
void finished();
|
void finished();
|
||||||
void failed(QString reason);
|
void failed(QString reason);
|
||||||
|
void cancelled();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// --- Subclasses must implement these ---
|
// --- Subclasses must implement these ---
|
||||||
|
|
@ -29,6 +30,7 @@ protected:
|
||||||
// Emit the outcome exactly once; ignore late signals after the intent is done.
|
// Emit the outcome exactly once; ignore late signals after the intent is done.
|
||||||
void emitFinished();
|
void emitFinished();
|
||||||
void emitFailed(const QString &reason);
|
void emitFailed(const QString &reason);
|
||||||
|
void emitCancelled();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool completed = false;
|
bool completed = false;
|
||||||
|
|
|
||||||
|
|
@ -19,13 +19,10 @@ bool IntentJoinServerGame::checkPrecondition() const
|
||||||
if (remoteClient->getStatus() != ClientStatus::StatusLoggedIn) {
|
if (remoteClient->getStatus() != ClientStatus::StatusLoggedIn) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
// peerPort() reflects the actual TCP peer, which may differ from the
|
// serverName() reflects the server the client was configured to connect to,
|
||||||
// configured server port (e.g. when connecting through a proxy), so only
|
// which may differ from the actual TCP peer (e.g. when connecting through a
|
||||||
// the hostname is compared here.
|
// proxy), so only the hostname is compared here.
|
||||||
if (remoteClient->peerName() != context->roomContext.serverContext.hostname) {
|
if (remoteClient->serverName().compare(context->roomContext.serverContext.hostname, Qt::CaseInsensitive) != 0) {
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (QString::number(remoteClient->peerPort()) != context->roomContext.serverContext.port) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,11 @@
|
||||||
#include "intent_login.h"
|
#include "intent_login.h"
|
||||||
|
|
||||||
#include "../../client/settings/cache_settings.h"
|
#include "../../client/settings/cache_settings.h"
|
||||||
|
#include "../widgets/dialogs/dlg_login_prompt.h"
|
||||||
#include "libcockatrice/settings/servers_settings.h"
|
#include "libcockatrice/settings/servers_settings.h"
|
||||||
|
|
||||||
|
#include <QDialog>
|
||||||
|
|
||||||
IntentGetLoginCredentials::IntentGetLoginCredentials(ContextConnectToServer *_context) : Intent(), context(_context)
|
IntentGetLoginCredentials::IntentGetLoginCredentials(ContextConnectToServer *_context) : Intent(), context(_context)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
@ -29,5 +32,27 @@ void IntentGetLoginCredentials::onPreconditionSatisfied()
|
||||||
|
|
||||||
void IntentGetLoginCredentials::onPreconditionNotSatisfied()
|
void IntentGetLoginCredentials::onPreconditionNotSatisfied()
|
||||||
{
|
{
|
||||||
emitFailed(tr("No saved credentials for this server"));
|
// No credentials saved for the target server: ask the user for them. They
|
||||||
|
// opt into saving them so later links to the same server connect directly.
|
||||||
|
const QString serverText = context->hostname + ":" + context->port;
|
||||||
|
DlgLoginPrompt dialog(serverText);
|
||||||
|
// ApplicationModal: the dialog has no parent (the intent is not a widget),
|
||||||
|
// so WindowModal would not actually block any other window.
|
||||||
|
dialog.setWindowModality(Qt::ApplicationModal);
|
||||||
|
|
||||||
|
if (dialog.exec() != QDialog::Accepted) {
|
||||||
|
emitCancelled();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
context->username = dialog.username();
|
||||||
|
context->password = dialog.password();
|
||||||
|
|
||||||
|
if (dialog.savePassword() && !context->username.isEmpty()) {
|
||||||
|
ServersSettings &servers = SettingsCache::instance().servers();
|
||||||
|
servers.addNewServer(context->hostname, context->hostname, context->port, context->username, context->password,
|
||||||
|
true);
|
||||||
|
}
|
||||||
|
|
||||||
|
emitFinished();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
190
cockatrice/src/interface/intents/intent_open_shared_deck.cpp
Normal file
190
cockatrice/src/interface/intents/intent_open_shared_deck.cpp
Normal file
|
|
@ -0,0 +1,190 @@
|
||||||
|
#include "intent_open_shared_deck.h"
|
||||||
|
|
||||||
|
#include "../deck_loader/deck_loader.h"
|
||||||
|
#include "../widgets/dialogs/dlg_shared_decks_preview.h"
|
||||||
|
#include "../widgets/tabs/tab_supervisor.h"
|
||||||
|
#include "intent_connect_to_server.h"
|
||||||
|
|
||||||
|
#include <QMessageBox>
|
||||||
|
#include <QTimer>
|
||||||
|
#include <libcockatrice/card/database/card_database_querier.h>
|
||||||
|
#include <libcockatrice/protocol/pb/command_deck_share_download.pb.h>
|
||||||
|
#include <libcockatrice/protocol/pb/command_deck_share_list.pb.h>
|
||||||
|
#include <libcockatrice/protocol/pb/response.pb.h>
|
||||||
|
#include <libcockatrice/protocol/pb/response_deck_share_download.pb.h>
|
||||||
|
#include <libcockatrice/protocol/pb/response_deck_share_list.pb.h>
|
||||||
|
#include <libcockatrice/protocol/pb/serverinfo_deck_share_item.pb.h>
|
||||||
|
#include <libcockatrice/protocol/pending_command.h>
|
||||||
|
|
||||||
|
IntentOpenSharedDeck::IntentOpenSharedDeck(TabSupervisor *_tabSupervisor,
|
||||||
|
RemoteClient *_remoteClient,
|
||||||
|
const CardDatabaseQuerier *_querier,
|
||||||
|
std::unique_ptr<ContextOpenDeck> _context)
|
||||||
|
: Intent(), tabSupervisor(_tabSupervisor), remoteClient(_remoteClient), querier(_querier),
|
||||||
|
context(_context.release())
|
||||||
|
{
|
||||||
|
downloadTimer = new QTimer(this);
|
||||||
|
downloadTimer->setSingleShot(true);
|
||||||
|
downloadTimer->setInterval(15000);
|
||||||
|
connect(downloadTimer, &QTimer::timeout, this, &IntentOpenSharedDeck::onDownloadTimeout);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool IntentOpenSharedDeck::checkPrecondition() const
|
||||||
|
{
|
||||||
|
if (remoteClient->getStatus() != ClientStatus::StatusLoggedIn) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
// serverName() reflects the server the client was configured to connect to,
|
||||||
|
// which may differ from the actual TCP peer (e.g. when connecting through a
|
||||||
|
// proxy), so only the hostname is compared here.
|
||||||
|
return remoteClient->serverName().compare(context->serverContext.hostname, Qt::CaseInsensitive) == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void IntentOpenSharedDeck::onPreconditionSatisfied()
|
||||||
|
{
|
||||||
|
// Resolve the share token to its items first; a share can contain more than
|
||||||
|
// one deck, and each item is downloaded by id.
|
||||||
|
Command_DeckShareList cmd;
|
||||||
|
cmd.set_token(context->shareToken.toStdString());
|
||||||
|
|
||||||
|
PendingCommand *pend = AbstractClient::prepareSessionCommand(cmd);
|
||||||
|
connect(pend, &PendingCommand::finished, this, &IntentOpenSharedDeck::listShareFinished);
|
||||||
|
remoteClient->sendCommand(pend);
|
||||||
|
}
|
||||||
|
|
||||||
|
void IntentOpenSharedDeck::onPreconditionNotSatisfied()
|
||||||
|
{
|
||||||
|
runDependency(new IntentConnectToServer(remoteClient, &context->serverContext));
|
||||||
|
}
|
||||||
|
|
||||||
|
void IntentOpenSharedDeck::listShareFinished(const Response &response, const CommandContainer & /* commandContainer */)
|
||||||
|
{
|
||||||
|
if (response.response_code() != Response::RespOk) {
|
||||||
|
emitFailed(tr("The shared deck could not be found or has expired"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const Response_DeckShareList &resp = response.GetExtension(Response_DeckShareList::ext);
|
||||||
|
if (resp.items_size() == 0) {
|
||||||
|
emitFailed(tr("The shared deck is empty"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
QList<ServerInfo_DeckShareItem> items;
|
||||||
|
items.reserve(resp.items_size());
|
||||||
|
for (const ServerInfo_DeckShareItem &item : resp.items()) {
|
||||||
|
items.append(item);
|
||||||
|
itemNames.insert(item.id(), QString::fromStdString(item.name()));
|
||||||
|
}
|
||||||
|
|
||||||
|
const QString serverText = context->serverContext.hostname + ":" + context->serverContext.port;
|
||||||
|
|
||||||
|
// Ask the user which decks to open before downloading anything.
|
||||||
|
previewDialog = new DlgSharedDecksPreview(tabSupervisor, querier, QString::fromStdString(resp.name()),
|
||||||
|
resp.expires_at(), serverText, items);
|
||||||
|
connect(previewDialog, &DlgSharedDecksPreview::openRequested, this, &IntentOpenSharedDeck::startDownloads);
|
||||||
|
connect(previewDialog, &DlgSharedDecksPreview::cancelled, this, &IntentOpenSharedDeck::emitCancelled);
|
||||||
|
connect(previewDialog, &DlgSharedDecksPreview::cancelled, previewDialog, &QWidget::deleteLater);
|
||||||
|
previewDialog->show();
|
||||||
|
previewDialog->raise();
|
||||||
|
previewDialog->activateWindow();
|
||||||
|
}
|
||||||
|
|
||||||
|
void IntentOpenSharedDeck::startDownloads(const QList<int> &itemIds)
|
||||||
|
{
|
||||||
|
pendingItemIds = itemIds;
|
||||||
|
totalItems = itemIds.size();
|
||||||
|
completedItems = 0;
|
||||||
|
loadedDecks.clear();
|
||||||
|
downloadNextItem();
|
||||||
|
}
|
||||||
|
|
||||||
|
void IntentOpenSharedDeck::downloadNextItem()
|
||||||
|
{
|
||||||
|
if (pendingItemIds.isEmpty()) {
|
||||||
|
finishAll();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
currentItemId = pendingItemIds.takeFirst();
|
||||||
|
downloadTimer->start();
|
||||||
|
|
||||||
|
Command_DeckShareDownload cmd;
|
||||||
|
cmd.set_token(context->shareToken.toStdString());
|
||||||
|
cmd.set_item_id(currentItemId);
|
||||||
|
|
||||||
|
PendingCommand *pend = AbstractClient::prepareSessionCommand(cmd);
|
||||||
|
connect(pend, &PendingCommand::finished, this, &IntentOpenSharedDeck::downloadShareFinished);
|
||||||
|
remoteClient->sendCommand(pend);
|
||||||
|
}
|
||||||
|
|
||||||
|
void IntentOpenSharedDeck::downloadShareFinished(const Response &response,
|
||||||
|
const CommandContainer & /* commandContainer */)
|
||||||
|
{
|
||||||
|
downloadTimer->stop();
|
||||||
|
|
||||||
|
QString failureReason;
|
||||||
|
if (response.response_code() != Response::RespOk) {
|
||||||
|
failureReason = tr("Failed to download the shared deck");
|
||||||
|
} else {
|
||||||
|
const Response_DeckShareDownload &resp = response.GetExtension(Response_DeckShareDownload::ext);
|
||||||
|
const QString deckString = QString::fromStdString(resp.deck());
|
||||||
|
if (deckString.isEmpty()) {
|
||||||
|
failureReason = tr("The shared deck is empty");
|
||||||
|
} else {
|
||||||
|
std::optional<LoadedDeck> deckOpt =
|
||||||
|
DeckLoader::loadFromRemote(deckString, LoadedDeck::LoadInfo::NON_REMOTE_ID);
|
||||||
|
if (!deckOpt) {
|
||||||
|
failureReason = tr("The shared deck could not be loaded");
|
||||||
|
} else {
|
||||||
|
loadedDecks.append(deckOpt.value());
|
||||||
|
++completedItems;
|
||||||
|
previewDialog->setDownloadProgress(completedItems, totalItems,
|
||||||
|
itemNames.value(currentItemId, tr("Unknown deck")));
|
||||||
|
downloadNextItem();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onItemFailure(failureReason);
|
||||||
|
}
|
||||||
|
|
||||||
|
void IntentOpenSharedDeck::onItemFailure(const QString &reason)
|
||||||
|
{
|
||||||
|
downloadTimer->stop();
|
||||||
|
|
||||||
|
if (loadedDecks.isEmpty()) {
|
||||||
|
previewDialog->deleteLater();
|
||||||
|
emitFailed(reason);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const int downloadedCount = loadedDecks.size();
|
||||||
|
const QMessageBox::StandardButton answer = QMessageBox::question(
|
||||||
|
previewDialog, tr("Open shared decks"),
|
||||||
|
tr("Could not download the deck \"%1\".\n\n%n deck(s) were already downloaded. Open them?", "", downloadedCount)
|
||||||
|
.arg(itemNames.value(currentItemId, tr("Unknown deck"))),
|
||||||
|
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
|
||||||
|
|
||||||
|
if (answer == QMessageBox::Yes) {
|
||||||
|
finishAll();
|
||||||
|
} else {
|
||||||
|
previewDialog->deleteLater();
|
||||||
|
emitCancelled();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void IntentOpenSharedDeck::onDownloadTimeout()
|
||||||
|
{
|
||||||
|
onItemFailure(tr("Timed out while downloading the shared deck"));
|
||||||
|
}
|
||||||
|
|
||||||
|
void IntentOpenSharedDeck::finishAll()
|
||||||
|
{
|
||||||
|
previewDialog->deleteLater();
|
||||||
|
for (const LoadedDeck &deck : loadedDecks) {
|
||||||
|
tabSupervisor->openDeckInNewTab(deck);
|
||||||
|
}
|
||||||
|
emitFinished();
|
||||||
|
}
|
||||||
59
cockatrice/src/interface/intents/intent_open_shared_deck.h
Normal file
59
cockatrice/src/interface/intents/intent_open_shared_deck.h
Normal file
|
|
@ -0,0 +1,59 @@
|
||||||
|
#ifndef COCKATRICE_INTENT_OPEN_SHARED_DECK_H
|
||||||
|
#define COCKATRICE_INTENT_OPEN_SHARED_DECK_H
|
||||||
|
|
||||||
|
#include "contexts/context_open_deck.h"
|
||||||
|
#include "intent.h"
|
||||||
|
#include "remote_client.h"
|
||||||
|
|
||||||
|
#include <QList>
|
||||||
|
#include <QMap>
|
||||||
|
#include <QScopedPointer>
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
|
class TabSupervisor;
|
||||||
|
struct LoadedDeck;
|
||||||
|
class CardDatabaseQuerier;
|
||||||
|
class DlgSharedDecksPreview;
|
||||||
|
class QTimer;
|
||||||
|
|
||||||
|
class IntentOpenSharedDeck : public Intent
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
IntentOpenSharedDeck(TabSupervisor *_tabSupervisor,
|
||||||
|
RemoteClient *_remoteClient,
|
||||||
|
const CardDatabaseQuerier *_querier,
|
||||||
|
std::unique_ptr<ContextOpenDeck> _context);
|
||||||
|
|
||||||
|
protected:
|
||||||
|
bool checkPrecondition() const override;
|
||||||
|
void onPreconditionSatisfied() override;
|
||||||
|
void onPreconditionNotSatisfied() override;
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void listShareFinished(const Response &response, const CommandContainer &commandContainer);
|
||||||
|
void downloadShareFinished(const Response &response, const CommandContainer &commandContainer);
|
||||||
|
void onDownloadTimeout();
|
||||||
|
|
||||||
|
private:
|
||||||
|
void startDownloads(const QList<int> &itemIds);
|
||||||
|
void downloadNextItem();
|
||||||
|
void onItemFailure(const QString &reason);
|
||||||
|
void finishAll();
|
||||||
|
|
||||||
|
TabSupervisor *tabSupervisor;
|
||||||
|
RemoteClient *remoteClient;
|
||||||
|
const CardDatabaseQuerier *querier;
|
||||||
|
QScopedPointer<ContextOpenDeck> context;
|
||||||
|
DlgSharedDecksPreview *previewDialog = nullptr;
|
||||||
|
QTimer *downloadTimer;
|
||||||
|
QMap<int, QString> itemNames;
|
||||||
|
QList<int> pendingItemIds;
|
||||||
|
QList<LoadedDeck> loadedDecks;
|
||||||
|
int currentItemId = 0;
|
||||||
|
int totalItems = 0;
|
||||||
|
int completedItems = 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // COCKATRICE_INTENT_OPEN_SHARED_DECK_H
|
||||||
|
|
@ -1,19 +1,28 @@
|
||||||
#include "url_parser.h"
|
#include "url_parser.h"
|
||||||
|
|
||||||
|
#include "../../client/settings/cache_settings.h"
|
||||||
#include "../widgets/tabs/tab_room.h"
|
#include "../widgets/tabs/tab_room.h"
|
||||||
#include "../widgets/tabs/tab_supervisor.h"
|
#include "../widgets/tabs/tab_supervisor.h"
|
||||||
#include "../window_main.h"
|
#include "../window_main.h"
|
||||||
#include "contexts/context_join_game.h"
|
#include "contexts/context_join_game.h"
|
||||||
|
#include "contexts/context_open_deck.h"
|
||||||
|
#include "intent.h"
|
||||||
#include "intent_join_server_game.h"
|
#include "intent_join_server_game.h"
|
||||||
#include "intent_login.h"
|
#include "intent_login.h"
|
||||||
|
#include "intent_open_shared_deck.h"
|
||||||
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
#include <QLoggingCategory>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QUrl>
|
#include <QUrl>
|
||||||
#include <QUrlQuery>
|
#include <QUrlQuery>
|
||||||
|
#include <libcockatrice/card/database/card_database_manager.h>
|
||||||
#include <libcockatrice/network/client/abstract/abstract_client.h>
|
#include <libcockatrice/network/client/abstract/abstract_client.h>
|
||||||
|
#include <libcockatrice/settings/servers_settings.h>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
|
inline Q_LOGGING_CATEGORY(UrlParserLog, "url_parser");
|
||||||
|
|
||||||
IntentUrlParser::IntentUrlParser(QObject *parent, MainWindow *_mainWindow) : QObject(parent), mainWindow(_mainWindow)
|
IntentUrlParser::IntentUrlParser(QObject *parent, MainWindow *_mainWindow) : QObject(parent), mainWindow(_mainWindow)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
@ -29,16 +38,33 @@ void IntentUrlParser::handle(const QString &urlStr)
|
||||||
const QString action = url.host();
|
const QString action = url.host();
|
||||||
QUrlQuery query(url);
|
QUrlQuery query(url);
|
||||||
|
|
||||||
|
qCDebug(UrlParserLog) << "Parsing intent URL, action:" << action;
|
||||||
|
|
||||||
|
QList<Intent *> chain;
|
||||||
|
Intent *firstIntent = nullptr;
|
||||||
if (action == "joingame") {
|
if (action == "joingame") {
|
||||||
handleJoinGame(query);
|
firstIntent = createJoinGameIntent(query, chain);
|
||||||
} else if (action == "opendeck") {
|
} else if (action == "opendeck") {
|
||||||
// handleOpenDeck(query);
|
firstIntent = createOpenDeckIntent(query, chain);
|
||||||
} else {
|
} else {
|
||||||
qWarning() << "Unknown intent:" << action;
|
qWarning() << "Unknown intent:" << action;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (firstIntent == nullptr) {
|
||||||
|
// The link was invalid or the user declined the confirm: nothing runs.
|
||||||
|
// Report the idle state when no other chain is queued so that a startup
|
||||||
|
// launch (which skipped its own connection for this URL) falls back to it.
|
||||||
|
if (!chainRunning && pendingChains.isEmpty()) {
|
||||||
|
emit urlChainFinished(mainWindow->getRemoteClient()->getStatus() == StatusLoggedIn);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
pendingChains.append(chain);
|
||||||
|
startNextChain();
|
||||||
}
|
}
|
||||||
|
|
||||||
void IntentUrlParser::handleJoinGame(const QUrlQuery &query)
|
Intent *IntentUrlParser::createJoinGameIntent(const QUrlQuery &query, QList<Intent *> &chain)
|
||||||
{
|
{
|
||||||
auto showError = [this](const QString &message) { QMessageBox::warning(mainWindow, tr("Open game"), message); };
|
auto showError = [this](const QString &message) { QMessageBox::warning(mainWindow, tr("Open game"), message); };
|
||||||
|
|
||||||
|
|
@ -49,21 +75,21 @@ void IntentUrlParser::handleJoinGame(const QUrlQuery &query)
|
||||||
|
|
||||||
if (ctx->roomContext.serverContext.hostname.isEmpty()) {
|
if (ctx->roomContext.serverContext.hostname.isEmpty()) {
|
||||||
showError(tr("Missing or empty hostname in the game link"));
|
showError(tr("Missing or empty hostname in the game link"));
|
||||||
return;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ok = false;
|
bool ok = false;
|
||||||
ctx->roomContext.serverContext.port.toUShort(&ok);
|
ctx->roomContext.serverContext.port.toUShort(&ok);
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
showError(tr("Invalid or missing port in the game link"));
|
showError(tr("Invalid or missing port in the game link"));
|
||||||
return;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx->roomContext.roomId = query.queryItemValue("roomid").toInt(&ok);
|
ctx->roomContext.roomId = query.queryItemValue("roomid").toInt(&ok);
|
||||||
|
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
showError(tr("Invalid or missing room id in the game link"));
|
showError(tr("Invalid or missing room id in the game link"));
|
||||||
return;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
ok = false;
|
ok = false;
|
||||||
|
|
@ -71,7 +97,7 @@ void IntentUrlParser::handleJoinGame(const QUrlQuery &query)
|
||||||
|
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
showError(tr("Invalid or missing game id in the game link"));
|
showError(tr("Invalid or missing game id in the game link"));
|
||||||
return;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
const QString gameDescription = query.queryItemValue("game", QUrl::FullyDecoded);
|
const QString gameDescription = query.queryItemValue("game", QUrl::FullyDecoded);
|
||||||
|
|
@ -80,24 +106,32 @@ void IntentUrlParser::handleJoinGame(const QUrlQuery &query)
|
||||||
const QMessageBox::StandardButton answer = QMessageBox::question(
|
const QMessageBox::StandardButton answer = QMessageBox::question(
|
||||||
mainWindow, tr("Join game"), message, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
|
mainWindow, tr("Join game"), message, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
|
||||||
if (answer != QMessageBox::Yes) {
|
if (answer != QMessageBox::Yes) {
|
||||||
return;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
RemoteClient *client = mainWindow->getRemoteClient();
|
||||||
|
ContextConnectToServer *serverContext = &ctx->roomContext.serverContext;
|
||||||
|
|
||||||
// The join game intent owns the context and the credential lookup; once the
|
// The join game intent owns the context and the credential lookup; once the
|
||||||
// chain finishes (or fails) it deletes the whole tree.
|
// chain finishes (or fails) it deletes the whole tree.
|
||||||
ContextConnectToServer *serverContext = &ctx->roomContext.serverContext;
|
auto joinGameIntent = new IntentJoinServerGame(mainWindow->getTabSupervisor(), client, std::move(ctx));
|
||||||
auto joinGameIntent =
|
|
||||||
new IntentJoinServerGame(mainWindow->getTabSupervisor(), mainWindow->getRemoteClient(), std::move(ctx));
|
|
||||||
joinGameIntent->setParent(this);
|
joinGameIntent->setParent(this);
|
||||||
|
chain.append(joinGameIntent);
|
||||||
auto getLoginCredentialsIntent = new IntentGetLoginCredentials(serverContext);
|
|
||||||
getLoginCredentialsIntent->setParent(joinGameIntent);
|
|
||||||
|
|
||||||
connect(getLoginCredentialsIntent, &Intent::finished, joinGameIntent, &Intent::execute);
|
|
||||||
connect(getLoginCredentialsIntent, &Intent::failed, joinGameIntent, &Intent::failed);
|
|
||||||
connect(joinGameIntent, &Intent::failed, this, [showError](const QString &reason) { showError(reason); });
|
connect(joinGameIntent, &Intent::failed, this, [showError](const QString &reason) { showError(reason); });
|
||||||
|
|
||||||
getLoginCredentialsIntent->execute();
|
Intent *firstIntent = joinGameIntent;
|
||||||
|
if (!isConnectedTo(serverContext->hostname, serverContext->port)) {
|
||||||
|
auto getLoginCredentialsIntent = new IntentGetLoginCredentials(serverContext);
|
||||||
|
getLoginCredentialsIntent->setParent(joinGameIntent);
|
||||||
|
chain.insert(0, getLoginCredentialsIntent);
|
||||||
|
|
||||||
|
connect(getLoginCredentialsIntent, &Intent::finished, joinGameIntent, &Intent::execute);
|
||||||
|
connect(getLoginCredentialsIntent, &Intent::failed, joinGameIntent, &Intent::failed);
|
||||||
|
connect(getLoginCredentialsIntent, &Intent::cancelled, joinGameIntent, &Intent::cancelled);
|
||||||
|
firstIntent = getLoginCredentialsIntent;
|
||||||
|
}
|
||||||
|
|
||||||
|
return firstIntent;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString IntentUrlParser::generateJoinGameMessage(const ContextJoinGame &context, const QString &gameDescription)
|
QString IntentUrlParser::generateJoinGameMessage(const ContextJoinGame &context, const QString &gameDescription)
|
||||||
|
|
@ -134,3 +168,221 @@ QString IntentUrlParser::generateJoinGameMessage(const ContextJoinGame &context,
|
||||||
.arg(gameDescription, gameIdStr, roomTab->getRoomName(), server)
|
.arg(gameDescription, gameIdStr, roomTab->getRoomName(), server)
|
||||||
: tr("Join game \"%1\" (#%2) on %3?").arg(gameDescription, gameIdStr, server);
|
: tr("Join game \"%1\" (#%2) on %3?").arg(gameDescription, gameIdStr, server);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Intent *IntentUrlParser::createOpenDeckIntent(const QUrlQuery &query, QList<Intent *> &chain)
|
||||||
|
{
|
||||||
|
auto showError = [this](const QString &message) {
|
||||||
|
QMessageBox::warning(mainWindow, tr("Open shared deck"), message);
|
||||||
|
};
|
||||||
|
|
||||||
|
auto ctx = std::make_unique<ContextOpenDeck>();
|
||||||
|
|
||||||
|
ctx->serverContext.hostname = query.queryItemValue("hostname");
|
||||||
|
ctx->serverContext.port = query.queryItemValue("port");
|
||||||
|
ctx->shareToken = query.queryItemValue("share");
|
||||||
|
|
||||||
|
qCDebug(UrlParserLog) << "Open-deck intent: host" << ctx->serverContext.hostname << "port"
|
||||||
|
<< ctx->serverContext.port << "token length" << ctx->shareToken.length();
|
||||||
|
|
||||||
|
if (ctx->serverContext.hostname.isEmpty()) {
|
||||||
|
showError(tr("Missing or empty hostname in the share link"));
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ok = false;
|
||||||
|
const quint16 port = ctx->serverContext.port.toUShort(&ok);
|
||||||
|
if (!ok || port == 0) {
|
||||||
|
showError(tr("Invalid or missing port in the share link"));
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ctx->shareToken.isEmpty()) {
|
||||||
|
showError(tr("Missing or empty share value in the share link"));
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
RemoteClient *client = mainWindow->getRemoteClient();
|
||||||
|
|
||||||
|
// When the link would move us away from a live session, ask first — the
|
||||||
|
// open deck download needs the connection the user already has. Remember
|
||||||
|
// the current session so a failed or cancelled chain can restore it.
|
||||||
|
const bool migrating =
|
||||||
|
client->getStatus() == StatusLoggedIn && !isConnectedTo(ctx->serverContext.hostname, ctx->serverContext.port);
|
||||||
|
if (migrating) {
|
||||||
|
const QString target = QStringLiteral("%1:%2").arg(ctx->serverContext.hostname, ctx->serverContext.port);
|
||||||
|
const QString current =
|
||||||
|
QStringLiteral("%1:%2").arg(client->serverName(), QString::number(client->serverPort()));
|
||||||
|
const QMessageBox::StandardButton answer = QMessageBox::question(
|
||||||
|
mainWindow, tr("Open shared deck"),
|
||||||
|
tr("Opening this share link connects you to %1 instead of %2.\n\nContinue?").arg(target, current),
|
||||||
|
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
|
||||||
|
if (answer != QMessageBox::Yes) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
migrationTargetHost = ctx->serverContext.hostname;
|
||||||
|
migrationTargetPort = ctx->serverContext.port;
|
||||||
|
previousServerHost = client->serverName();
|
||||||
|
previousServerPort = QString::number(client->serverPort());
|
||||||
|
pendingRestore = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
ContextConnectToServer *serverContext = &ctx->serverContext;
|
||||||
|
|
||||||
|
// The open deck intent owns the context and the credential lookup; once
|
||||||
|
// the chain finishes (or fails) it deletes the whole tree.
|
||||||
|
auto openDeckIntent =
|
||||||
|
new IntentOpenSharedDeck(mainWindow->getTabSupervisor(), client, CardDatabaseManager::query(), std::move(ctx));
|
||||||
|
openDeckIntent->setParent(this);
|
||||||
|
chain.append(openDeckIntent);
|
||||||
|
connect(openDeckIntent, &Intent::failed, this, [showError](const QString &reason) { showError(reason); });
|
||||||
|
|
||||||
|
Intent *firstIntent = openDeckIntent;
|
||||||
|
if (!isConnectedTo(serverContext->hostname, serverContext->port)) {
|
||||||
|
auto getLoginCredentialsIntent = new IntentGetLoginCredentials(serverContext);
|
||||||
|
getLoginCredentialsIntent->setParent(openDeckIntent);
|
||||||
|
chain.insert(0, getLoginCredentialsIntent);
|
||||||
|
|
||||||
|
connect(getLoginCredentialsIntent, &Intent::finished, openDeckIntent, &Intent::execute);
|
||||||
|
connect(getLoginCredentialsIntent, &Intent::failed, openDeckIntent, &Intent::failed);
|
||||||
|
connect(getLoginCredentialsIntent, &Intent::cancelled, openDeckIntent, &Intent::cancelled);
|
||||||
|
firstIntent = getLoginCredentialsIntent;
|
||||||
|
}
|
||||||
|
|
||||||
|
return firstIntent;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool IntentUrlParser::isConnectedTo(const QString &hostname, const QString &port) const
|
||||||
|
{
|
||||||
|
Q_UNUSED(port);
|
||||||
|
// Deliberately hostname-only (no port): the intents' preconditions apply the
|
||||||
|
// same rule, so a link to the same host on another port still connects
|
||||||
|
// rather than silently reusing an existing session on a different server.
|
||||||
|
RemoteClient *client = mainWindow->getRemoteClient();
|
||||||
|
return client->getStatus() == StatusLoggedIn && client->serverName().compare(hostname, Qt::CaseInsensitive) == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void IntentUrlParser::startNextChain()
|
||||||
|
{
|
||||||
|
if (chainRunning || pendingChains.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
chainRunning = true;
|
||||||
|
currentChainSucceeded = false;
|
||||||
|
|
||||||
|
const QList<Intent *> chain = pendingChains.takeFirst();
|
||||||
|
if (chain.isEmpty()) {
|
||||||
|
chainRunning = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only the last intent completes the chain; its terminal signal ends the
|
||||||
|
// whole run. Cancellation of an intermediate intent (e.g. declined login
|
||||||
|
// prompt) is forwarded onto the last intent in the chain builders above.
|
||||||
|
Intent *finalIntent = chain.last();
|
||||||
|
connect(finalIntent, &Intent::finished, this, [this]() {
|
||||||
|
currentChainSucceeded = true;
|
||||||
|
chainEnded();
|
||||||
|
});
|
||||||
|
connect(finalIntent, &Intent::failed, this, &IntentUrlParser::chainEnded);
|
||||||
|
connect(finalIntent, &Intent::cancelled, this, &IntentUrlParser::chainEnded);
|
||||||
|
|
||||||
|
chain.first()->execute();
|
||||||
|
}
|
||||||
|
|
||||||
|
void IntentUrlParser::chainEnded()
|
||||||
|
{
|
||||||
|
chainRunning = false;
|
||||||
|
|
||||||
|
// Only a failed or cancelled chain restores the session the link migrated
|
||||||
|
// away from; a successful one leaves the user where they are.
|
||||||
|
if (pendingRestore && !currentChainSucceeded) {
|
||||||
|
restorePreviousServer();
|
||||||
|
}
|
||||||
|
pendingRestore = false;
|
||||||
|
|
||||||
|
startNextChain();
|
||||||
|
|
||||||
|
// Only report the terminal state once the queue has fully drained, so a
|
||||||
|
// queued follow-up link keeps the startup fallback out of the picture.
|
||||||
|
if (!chainRunning && pendingChains.isEmpty()) {
|
||||||
|
emit urlChainFinished(mainWindow->getRemoteClient()->getStatus() == StatusLoggedIn);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void IntentUrlParser::restorePreviousServer()
|
||||||
|
{
|
||||||
|
if (previousServerHost.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
RemoteClient *client = mainWindow->getRemoteClient();
|
||||||
|
const ClientStatus status = client->getStatus();
|
||||||
|
|
||||||
|
// A failed/cancelled chain can fire while the client is still settling the
|
||||||
|
// in-flight connection attempt (wrong password, connect timeout). Only
|
||||||
|
// decide once the client has settled into logged-in or disconnected;
|
||||||
|
// deciding mid-connect would strand the user offline from their previous
|
||||||
|
// server.
|
||||||
|
if (status == StatusDisconnected || status == StatusLoggedIn) {
|
||||||
|
restoreToPreviousServer();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
auto waitConnection = std::make_shared<QMetaObject::Connection>();
|
||||||
|
*waitConnection = connect(client, &RemoteClient::statusChanged, this, [this, client, waitConnection]() {
|
||||||
|
const ClientStatus settled = client->getStatus();
|
||||||
|
if (settled == StatusDisconnected || settled == StatusLoggedIn) {
|
||||||
|
QObject::disconnect(*waitConnection);
|
||||||
|
restoreToPreviousServer();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
void IntentUrlParser::restoreToPreviousServer()
|
||||||
|
{
|
||||||
|
RemoteClient *client = mainWindow->getRemoteClient();
|
||||||
|
|
||||||
|
// Back on the previous server already → nothing to undo.
|
||||||
|
if (client->serverName().compare(previousServerHost, Qt::CaseInsensitive) == 0 &&
|
||||||
|
QString::number(client->serverPort()) == previousServerPort) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// When logged in somewhere, only intervene if that somewhere is the server
|
||||||
|
// the link moved us to; if the user went elsewhere on their own, leave them.
|
||||||
|
if (client->getStatus() == StatusLoggedIn) {
|
||||||
|
const bool onMigrationTarget = client->serverName().compare(migrationTargetHost, Qt::CaseInsensitive) == 0 &&
|
||||||
|
QString::number(client->serverPort()) == migrationTargetPort;
|
||||||
|
if (!onMigrationTarget) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ServersSettings &servers = SettingsCache::instance().servers();
|
||||||
|
const int index = servers.findServerIndex(previousServerHost, previousServerPort);
|
||||||
|
if (index >= 0 && servers.hasLoginData(previousServerHost, previousServerPort)) {
|
||||||
|
const QString username =
|
||||||
|
servers.getValue(QString("username%1").arg(index), "server", "server_details").toString();
|
||||||
|
const QString password =
|
||||||
|
servers.getValue(QString("password%1").arg(index), "server", "server_details").toString();
|
||||||
|
client->connectToServer(previousServerHost, previousServerPort.toUInt(), username, password);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
client->disconnectFromServer();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (client->getStatus() != StatusDisconnected) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The link's connection attempt failed: reconnect to the previous server
|
||||||
|
// when credentials are saved, otherwise stay offline.
|
||||||
|
ServersSettings &servers = SettingsCache::instance().servers();
|
||||||
|
const int index = servers.findServerIndex(previousServerHost, previousServerPort);
|
||||||
|
if (index >= 0 && servers.hasLoginData(previousServerHost, previousServerPort)) {
|
||||||
|
const QString username =
|
||||||
|
servers.getValue(QString("username%1").arg(index), "server", "server_details").toString();
|
||||||
|
const QString password =
|
||||||
|
servers.getValue(QString("password%1").arg(index), "server", "server_details").toString();
|
||||||
|
client->connectToServer(previousServerHost, previousServerPort.toUInt(), username, password);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,22 @@
|
||||||
#ifndef COCKATRICE_URL_PARSER_H
|
#ifndef COCKATRICE_URL_PARSER_H
|
||||||
#define COCKATRICE_URL_PARSER_H
|
#define COCKATRICE_URL_PARSER_H
|
||||||
|
#include <QList>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QUrlQuery>
|
#include <QUrlQuery>
|
||||||
|
|
||||||
|
class Intent;
|
||||||
class MainWindow;
|
class MainWindow;
|
||||||
struct ContextJoinGame;
|
struct ContextJoinGame;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Parses cockatrice:// links and runs them as serialized intent chains.
|
||||||
|
*
|
||||||
|
* Links are parsed by action (joingame/opendeck) and translated into an intent
|
||||||
|
* chain. Chains are queued and run one at a time: a document can hand multiple
|
||||||
|
* links to the window while an earlier chain still connects, and running two
|
||||||
|
* connect chains concurrently tears the connection down. urlChainFinished is
|
||||||
|
* emitted once the queue has fully drained.
|
||||||
|
*/
|
||||||
class IntentUrlParser : public QObject
|
class IntentUrlParser : public QObject
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
@ -12,12 +24,34 @@ class IntentUrlParser : public QObject
|
||||||
public:
|
public:
|
||||||
IntentUrlParser(QObject *parent, MainWindow *mainWindow);
|
IntentUrlParser(QObject *parent, MainWindow *mainWindow);
|
||||||
void handle(const QString &urlStr);
|
void handle(const QString &urlStr);
|
||||||
void handleJoinGame(const QUrlQuery &query);
|
|
||||||
|
signals:
|
||||||
|
/** @brief Emitted when the last queued chain ended; carries whether the client is logged in. */
|
||||||
|
void urlChainFinished(bool connected);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
Intent *createJoinGameIntent(const QUrlQuery &query, QList<Intent *> &chain);
|
||||||
|
Intent *createOpenDeckIntent(const QUrlQuery &query, QList<Intent *> &chain);
|
||||||
QString generateJoinGameMessage(const ContextJoinGame &context, const QString &gameDescription);
|
QString generateJoinGameMessage(const ContextJoinGame &context, const QString &gameDescription);
|
||||||
|
[[nodiscard]] bool isConnectedTo(const QString &hostname, const QString &port) const;
|
||||||
|
void startNextChain();
|
||||||
|
void chainEnded();
|
||||||
|
void restorePreviousServer();
|
||||||
|
void restoreToPreviousServer();
|
||||||
|
|
||||||
MainWindow *mainWindow;
|
MainWindow *mainWindow;
|
||||||
|
QList<QList<Intent *>> pendingChains;
|
||||||
|
bool chainRunning = false;
|
||||||
|
bool currentChainSucceeded = false;
|
||||||
|
|
||||||
|
// Set when an open-deck link migrates the session to another server. If the
|
||||||
|
// chain then fails or is cancelled while still on that server, the previous
|
||||||
|
// session is restored (reconnect if credentials are saved, else disconnect).
|
||||||
|
QString migrationTargetHost;
|
||||||
|
QString migrationTargetPort;
|
||||||
|
QString previousServerHost;
|
||||||
|
QString previousServerPort;
|
||||||
|
bool pendingRestore = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // COCKATRICE_URL_PARSER_H
|
#endif // COCKATRICE_URL_PARSER_H
|
||||||
|
|
|
||||||
|
|
@ -133,12 +133,14 @@ void CardInfoPictureWithTextOverlayWidget::paintEvent(QPaintEvent *event)
|
||||||
path.addRoundedRect(glowRect, radius, radius);
|
path.addRoundedRect(glowRect, radius, radius);
|
||||||
|
|
||||||
// Soft outer glow
|
// Soft outer glow
|
||||||
QColor glowColor(0, 150, 255, 80); // subtle blu
|
QColor glowColor = palette().color(QPalette::Highlight);
|
||||||
|
glowColor.setAlpha(80);
|
||||||
painter.setPen(QPen(glowColor, 6));
|
painter.setPen(QPen(glowColor, 6));
|
||||||
painter.drawPath(path);
|
painter.drawPath(path);
|
||||||
|
|
||||||
// Thin inner border for crispness
|
// Thin inner border for crispness
|
||||||
QColor borderColor(0, 150, 255, 200);
|
QColor borderColor = palette().color(QPalette::Highlight);
|
||||||
|
borderColor.setAlpha(200);
|
||||||
painter.setPen(QPen(borderColor, 2));
|
painter.setPen(QPen(borderColor, 2));
|
||||||
painter.drawRoundedRect(pixmapRect, radius, radius);
|
painter.drawRoundedRect(pixmapRect, radius, radius);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,14 +27,16 @@ DeckPreviewCardPictureWidget::DeckPreviewCardPictureWidget(QWidget *parent,
|
||||||
const QColor &textColor,
|
const QColor &textColor,
|
||||||
const QColor &outlineColor,
|
const QColor &outlineColor,
|
||||||
const int fontSize,
|
const int fontSize,
|
||||||
const Qt::Alignment alignment)
|
const Qt::Alignment alignment,
|
||||||
|
const bool _emitClickImmediately)
|
||||||
: CardInfoPictureWithTextOverlayWidget(parent,
|
: CardInfoPictureWithTextOverlayWidget(parent,
|
||||||
hoverToZoomEnabled,
|
hoverToZoomEnabled,
|
||||||
raiseOnEnter,
|
raiseOnEnter,
|
||||||
textColor,
|
textColor,
|
||||||
outlineColor,
|
outlineColor,
|
||||||
fontSize,
|
fontSize,
|
||||||
alignment)
|
alignment),
|
||||||
|
emitClickImmediately(_emitClickImmediately)
|
||||||
{
|
{
|
||||||
singleClickTimer = new QTimer(this);
|
singleClickTimer = new QTimer(this);
|
||||||
singleClickTimer->setSingleShot(true);
|
singleClickTimer->setSingleShot(true);
|
||||||
|
|
@ -50,8 +52,13 @@ DeckPreviewCardPictureWidget::DeckPreviewCardPictureWidget(QWidget *parent,
|
||||||
void DeckPreviewCardPictureWidget::mousePressEvent(QMouseEvent *event)
|
void DeckPreviewCardPictureWidget::mousePressEvent(QMouseEvent *event)
|
||||||
{
|
{
|
||||||
if (event->button() == Qt::LeftButton) {
|
if (event->button() == Qt::LeftButton) {
|
||||||
lastMouseEvent = event;
|
if (emitClickImmediately) {
|
||||||
singleClickTimer->start(QApplication::doubleClickInterval());
|
emit imageClicked(event, this);
|
||||||
|
emit imageSingleClicked();
|
||||||
|
} else {
|
||||||
|
lastMouseEvent = event;
|
||||||
|
singleClickTimer->start(QApplication::doubleClickInterval());
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
emit imageClicked(event, this);
|
emit imageClicked(event, this);
|
||||||
event->accept();
|
event->accept();
|
||||||
|
|
@ -61,7 +68,14 @@ void DeckPreviewCardPictureWidget::mousePressEvent(QMouseEvent *event)
|
||||||
void DeckPreviewCardPictureWidget::mouseDoubleClickEvent(QMouseEvent *event)
|
void DeckPreviewCardPictureWidget::mouseDoubleClickEvent(QMouseEvent *event)
|
||||||
{
|
{
|
||||||
if (event->button() == Qt::LeftButton) {
|
if (event->button() == Qt::LeftButton) {
|
||||||
singleClickTimer->stop(); // Prevent single-click logic
|
if (emitClickImmediately) {
|
||||||
emit imageDoubleClicked(lastMouseEvent, this);
|
// Do not report a second single click for the second press of the
|
||||||
|
// double-click; the consumer maps the double-click to select+open.
|
||||||
|
lastMouseEvent = event;
|
||||||
|
emit imageDoubleClicked(event, this);
|
||||||
|
} else {
|
||||||
|
singleClickTimer->stop(); // Prevent single-click logic
|
||||||
|
emit imageDoubleClicked(lastMouseEvent, this);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,13 +20,28 @@ class DeckPreviewCardPictureWidget final : public CardInfoPictureWithTextOverlay
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
/**
|
||||||
|
* @brief Constructs a DeckPreviewCardPictureWidget.
|
||||||
|
* @param parent The parent widget.
|
||||||
|
* @param hoverToZoomEnabled If this widget will spawn a larger widget when hovered over.
|
||||||
|
* @param raiseOnEnter If the widget raises its border when the mouse enters.
|
||||||
|
* @param textColor The color of the overlay text.
|
||||||
|
* @param outlineColor The color of the outline around the text.
|
||||||
|
* @param fontSize The font size of the overlay text.
|
||||||
|
* @param alignment The alignment of the text within the overlay.
|
||||||
|
* @param emitClickImmediately If true, a left click is reported immediately on click
|
||||||
|
* instead of after the double-click interval. Use this for selection surfaces
|
||||||
|
* where reacting to a double-click (select-and-open) would needlessly delay the
|
||||||
|
* single-click feedback. The double-click signal is still emitted.
|
||||||
|
*/
|
||||||
explicit DeckPreviewCardPictureWidget(QWidget *parent,
|
explicit DeckPreviewCardPictureWidget(QWidget *parent,
|
||||||
bool hoverToZoomEnabled = false,
|
bool hoverToZoomEnabled = false,
|
||||||
bool raiseOnEnter = false,
|
bool raiseOnEnter = false,
|
||||||
const QColor &textColor = Qt::white,
|
const QColor &textColor = Qt::white,
|
||||||
const QColor &outlineColor = Qt::black,
|
const QColor &outlineColor = Qt::black,
|
||||||
int fontSize = 12,
|
int fontSize = 12,
|
||||||
Qt::Alignment alignment = Qt::AlignCenter);
|
Qt::Alignment alignment = Qt::AlignCenter,
|
||||||
|
bool _emitClickImmediately = false);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void imageClicked(QMouseEvent *event, DeckPreviewCardPictureWidget *instance);
|
void imageClicked(QMouseEvent *event, DeckPreviewCardPictureWidget *instance);
|
||||||
|
|
@ -36,6 +51,7 @@ signals:
|
||||||
private:
|
private:
|
||||||
QTimer *singleClickTimer;
|
QTimer *singleClickTimer;
|
||||||
QMouseEvent *lastMouseEvent = nullptr; // Store the last mouse event
|
QMouseEvent *lastMouseEvent = nullptr; // Store the last mouse event
|
||||||
|
bool emitClickImmediately;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void mousePressEvent(QMouseEvent *event) override;
|
void mousePressEvent(QMouseEvent *event) override;
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,139 @@
|
||||||
|
#include "shared_deck_preview_widget.h"
|
||||||
|
|
||||||
|
#include "../cards/additional_info/color_identity_widget.h"
|
||||||
|
#include "../cards/deck_preview_card_picture_widget.h"
|
||||||
|
|
||||||
|
#include <QCheckBox>
|
||||||
|
#include <QFrame>
|
||||||
|
#include <QHBoxLayout>
|
||||||
|
#include <QKeyEvent>
|
||||||
|
#include <QLabel>
|
||||||
|
#include <QVBoxLayout>
|
||||||
|
#include <libcockatrice/card/database/card_database_querier.h>
|
||||||
|
|
||||||
|
SharedDeckPreviewWidget::SharedDeckPreviewWidget(QWidget *parent,
|
||||||
|
const CardDatabaseQuerier *querier,
|
||||||
|
const QString &deckName,
|
||||||
|
const QString &bannerCardName,
|
||||||
|
const QString &colorIdentity,
|
||||||
|
const QString &gameFormat,
|
||||||
|
const QString &deckToolTip)
|
||||||
|
: QWidget(parent)
|
||||||
|
{
|
||||||
|
bannerCardDisplayWidget =
|
||||||
|
new DeckPreviewCardPictureWidget(this, false, false, Qt::white, Qt::black, 12, Qt::AlignCenter, true);
|
||||||
|
bannerCardDisplayWidget->setScaleFactor(100);
|
||||||
|
const ExactCard bannerCard = bannerCardName.isEmpty() ? ExactCard() : querier->getCard(CardRef{bannerCardName, {}});
|
||||||
|
bannerCardDisplayWidget->setCard(bannerCard);
|
||||||
|
bannerCardDisplayWidget->setOverlayText(deckName);
|
||||||
|
setToolTip(deckToolTip.isEmpty() ? deckName : deckToolTip);
|
||||||
|
setFocusPolicy(Qt::StrongFocus);
|
||||||
|
setBaseAccessibleName(deckName);
|
||||||
|
|
||||||
|
colorIdentityWidget = new ColorIdentityWidget(this, colorIdentity);
|
||||||
|
colorIdentityWidget->setVisible(!colorIdentity.isEmpty());
|
||||||
|
|
||||||
|
gameFormatLabel = new QLabel(gameFormat, this);
|
||||||
|
gameFormatLabel->setAlignment(Qt::AlignCenter);
|
||||||
|
gameFormatLabel->setVisible(!gameFormat.isEmpty());
|
||||||
|
|
||||||
|
selectionCheckBox = new QCheckBox(this);
|
||||||
|
selectionCheckBox->setToolTip(tr("Select this deck"));
|
||||||
|
// The tile itself is focusable (Space/Enter toggles); keep the checkbox
|
||||||
|
// from creating a second tab stop per tile.
|
||||||
|
selectionCheckBox->setFocusPolicy(Qt::NoFocus);
|
||||||
|
|
||||||
|
// Selection frame reused from the deck-preview selection covenant: a
|
||||||
|
// palette(highlight) border around the banner card, shown while selected.
|
||||||
|
selectionFrame = new QFrame(bannerCardDisplayWidget);
|
||||||
|
selectionFrame->setAttribute(Qt::WA_TransparentForMouseEvents);
|
||||||
|
selectionFrame->setStyleSheet(QStringLiteral(
|
||||||
|
"QFrame { border: 2px solid palette(highlight); border-radius: 4px; background: transparent; }"));
|
||||||
|
selectionFrame->setVisible(false);
|
||||||
|
|
||||||
|
auto *selectionRow = new QHBoxLayout;
|
||||||
|
selectionRow->addWidget(selectionCheckBox);
|
||||||
|
selectionRow->addStretch(1);
|
||||||
|
|
||||||
|
auto *layout = new QVBoxLayout(this);
|
||||||
|
layout->setContentsMargins(0, 0, 0, 0);
|
||||||
|
layout->addLayout(selectionRow);
|
||||||
|
layout->addWidget(bannerCardDisplayWidget, 0, Qt::AlignHCenter);
|
||||||
|
layout->addWidget(colorIdentityWidget, 0, Qt::AlignHCenter);
|
||||||
|
layout->addWidget(gameFormatLabel, 0, Qt::AlignHCenter);
|
||||||
|
setLayout(layout);
|
||||||
|
|
||||||
|
connect(selectionCheckBox, &QCheckBox::toggled, this, [this](bool checked) {
|
||||||
|
updateSelectionVisual(checked);
|
||||||
|
emit selectionToggled(checked);
|
||||||
|
});
|
||||||
|
connect(bannerCardDisplayWidget, &DeckPreviewCardPictureWidget::imageClicked, this,
|
||||||
|
&SharedDeckPreviewWidget::toggleSelection);
|
||||||
|
connect(bannerCardDisplayWidget, &DeckPreviewCardPictureWidget::imageDoubleClicked, this,
|
||||||
|
&SharedDeckPreviewWidget::activate);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool SharedDeckPreviewWidget::isSelected() const
|
||||||
|
{
|
||||||
|
return selectionCheckBox->isChecked();
|
||||||
|
}
|
||||||
|
|
||||||
|
void SharedDeckPreviewWidget::setSelected(bool selected)
|
||||||
|
{
|
||||||
|
if (isSelected() == selected) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
selectionCheckBox->setChecked(selected);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SharedDeckPreviewWidget::updateSelectionVisual(bool selected)
|
||||||
|
{
|
||||||
|
selectionFrame->setVisible(selected);
|
||||||
|
selectionFrame->raise();
|
||||||
|
if (selected) {
|
||||||
|
setAccessibleName(baseAccessibleName + tr(" (selected)"));
|
||||||
|
} else {
|
||||||
|
setAccessibleName(baseAccessibleName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void SharedDeckPreviewWidget::setBaseAccessibleName(const QString &name)
|
||||||
|
{
|
||||||
|
baseAccessibleName = name;
|
||||||
|
setAccessibleName(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SharedDeckPreviewWidget::toggleSelection()
|
||||||
|
{
|
||||||
|
setSelected(!isSelected());
|
||||||
|
}
|
||||||
|
|
||||||
|
void SharedDeckPreviewWidget::activate()
|
||||||
|
{
|
||||||
|
setSelected(true);
|
||||||
|
emit activated();
|
||||||
|
}
|
||||||
|
|
||||||
|
void SharedDeckPreviewWidget::resizeEvent(QResizeEvent *event)
|
||||||
|
{
|
||||||
|
QWidget::resizeEvent(event);
|
||||||
|
updateSelectionFrameGeometry();
|
||||||
|
}
|
||||||
|
|
||||||
|
void SharedDeckPreviewWidget::updateSelectionFrameGeometry()
|
||||||
|
{
|
||||||
|
if (selectionFrame == nullptr || bannerCardDisplayWidget == nullptr) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
selectionFrame->setGeometry(bannerCardDisplayWidget->rect().adjusted(1, 1, -1, -1));
|
||||||
|
}
|
||||||
|
|
||||||
|
void SharedDeckPreviewWidget::keyPressEvent(QKeyEvent *event)
|
||||||
|
{
|
||||||
|
if (event->key() == Qt::Key_Space || event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) {
|
||||||
|
toggleSelection();
|
||||||
|
event->accept();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
QWidget::keyPressEvent(event);
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,77 @@
|
||||||
|
/**
|
||||||
|
* @file shared_deck_preview_widget.h
|
||||||
|
* @ingroup DeckShareWidgets
|
||||||
|
*/
|
||||||
|
//! \todo Document this file.
|
||||||
|
|
||||||
|
#ifndef SHARED_DECK_PREVIEW_WIDGET_H
|
||||||
|
#define SHARED_DECK_PREVIEW_WIDGET_H
|
||||||
|
|
||||||
|
#include <QWidget>
|
||||||
|
|
||||||
|
class ColorIdentityWidget;
|
||||||
|
class DeckPreviewCardPictureWidget;
|
||||||
|
class QCheckBox;
|
||||||
|
class QFrame;
|
||||||
|
class QKeyEvent;
|
||||||
|
class QLabel;
|
||||||
|
class QResizeEvent;
|
||||||
|
class CardDatabaseQuerier;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief A selectable preview tile for a deck that has no local file.
|
||||||
|
*
|
||||||
|
* Renders a banner card picture (looked up by name in the card database), the
|
||||||
|
* deck name, color identity and game format. Used to preview decks shared via a
|
||||||
|
* cockatrice:// link (metadata from Command_DeckShareList) and the deck
|
||||||
|
* currently open in the deck editor.
|
||||||
|
*
|
||||||
|
* Selection follows the deck-preview covenant: the tile reports its click
|
||||||
|
* immediately (no double-click interval delay), a palette(highlight) frame
|
||||||
|
* marks the selected tile, and Space/Enter toggles selection from the keyboard.
|
||||||
|
* A double click selects the tile and emits activated() so the caller can open
|
||||||
|
* just that deck.
|
||||||
|
*/
|
||||||
|
class SharedDeckPreviewWidget : public QWidget
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit SharedDeckPreviewWidget(QWidget *parent,
|
||||||
|
const CardDatabaseQuerier *querier,
|
||||||
|
const QString &deckName,
|
||||||
|
const QString &bannerCardName,
|
||||||
|
const QString &colorIdentity,
|
||||||
|
const QString &gameFormat = QString(),
|
||||||
|
const QString &deckToolTip = QString());
|
||||||
|
|
||||||
|
[[nodiscard]] bool isSelected() const;
|
||||||
|
void setSelected(bool selected);
|
||||||
|
|
||||||
|
void setBaseAccessibleName(const QString &name);
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void selectionToggled(bool selected);
|
||||||
|
void activated();
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void resizeEvent(QResizeEvent *event) override;
|
||||||
|
void keyPressEvent(QKeyEvent *event) override;
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void toggleSelection();
|
||||||
|
void activate();
|
||||||
|
|
||||||
|
private:
|
||||||
|
void updateSelectionVisual(bool selected);
|
||||||
|
void updateSelectionFrameGeometry();
|
||||||
|
|
||||||
|
DeckPreviewCardPictureWidget *bannerCardDisplayWidget;
|
||||||
|
ColorIdentityWidget *colorIdentityWidget;
|
||||||
|
QLabel *gameFormatLabel;
|
||||||
|
QCheckBox *selectionCheckBox;
|
||||||
|
QFrame *selectionFrame;
|
||||||
|
QString baseAccessibleName;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // SHARED_DECK_PREVIEW_WIDGET_H
|
||||||
|
|
@ -0,0 +1,50 @@
|
||||||
|
#include "dlg_login_prompt.h"
|
||||||
|
|
||||||
|
#include <QCheckBox>
|
||||||
|
#include <QDialogButtonBox>
|
||||||
|
#include <QFormLayout>
|
||||||
|
#include <QLabel>
|
||||||
|
#include <QLineEdit>
|
||||||
|
#include <QVBoxLayout>
|
||||||
|
|
||||||
|
DlgLoginPrompt::DlgLoginPrompt(const QString &serverText, QWidget *parent) : QDialog(parent)
|
||||||
|
{
|
||||||
|
setWindowTitle(tr("Sign in"));
|
||||||
|
|
||||||
|
auto *mainLayout = new QVBoxLayout(this);
|
||||||
|
mainLayout->addWidget(
|
||||||
|
new QLabel(tr("This link requires you to be signed in.\nSign in to %1:").arg(serverText), this));
|
||||||
|
|
||||||
|
auto *formLayout = new QFormLayout;
|
||||||
|
usernameEdit = new QLineEdit(this);
|
||||||
|
passwordEdit = new QLineEdit(this);
|
||||||
|
passwordEdit->setEchoMode(QLineEdit::Password);
|
||||||
|
formLayout->addRow(tr("Username:"), usernameEdit);
|
||||||
|
formLayout->addRow(tr("Password:"), passwordEdit);
|
||||||
|
mainLayout->addLayout(formLayout);
|
||||||
|
|
||||||
|
savePasswordCheckBox = new QCheckBox(tr("Save password for this server"), this);
|
||||||
|
mainLayout->addWidget(savePasswordCheckBox);
|
||||||
|
|
||||||
|
auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
|
||||||
|
connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
|
||||||
|
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
|
||||||
|
mainLayout->addWidget(buttonBox);
|
||||||
|
|
||||||
|
usernameEdit->setFocus();
|
||||||
|
}
|
||||||
|
|
||||||
|
QString DlgLoginPrompt::username() const
|
||||||
|
{
|
||||||
|
return usernameEdit->text().trimmed();
|
||||||
|
}
|
||||||
|
|
||||||
|
QString DlgLoginPrompt::password() const
|
||||||
|
{
|
||||||
|
return passwordEdit->text();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool DlgLoginPrompt::savePassword() const
|
||||||
|
{
|
||||||
|
return savePasswordCheckBox->isChecked();
|
||||||
|
}
|
||||||
40
cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.h
Normal file
40
cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.h
Normal file
|
|
@ -0,0 +1,40 @@
|
||||||
|
/**
|
||||||
|
* @file dlg_login_prompt.h
|
||||||
|
* @ingroup ConnectionDialogs
|
||||||
|
*/
|
||||||
|
//! \todo Document this file.
|
||||||
|
|
||||||
|
#ifndef DLG_LOGIN_PROMPT_H
|
||||||
|
#define DLG_LOGIN_PROMPT_H
|
||||||
|
|
||||||
|
#include <QDialog>
|
||||||
|
|
||||||
|
class QCheckBox;
|
||||||
|
class QLineEdit;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Small sign-in dialog used when a cockatrice:// link needs credentials
|
||||||
|
* that are not saved for the target server.
|
||||||
|
*
|
||||||
|
* The entered name and password are handed to the intent chain; when the user
|
||||||
|
* opts to save them, they are stored in the server settings so that later links
|
||||||
|
* to the same server connect seamlessly.
|
||||||
|
*/
|
||||||
|
class DlgLoginPrompt : public QDialog
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit DlgLoginPrompt(const QString &serverText, QWidget *parent = nullptr);
|
||||||
|
|
||||||
|
[[nodiscard]] QString username() const;
|
||||||
|
[[nodiscard]] QString password() const;
|
||||||
|
[[nodiscard]] bool savePassword() const;
|
||||||
|
|
||||||
|
private:
|
||||||
|
QLineEdit *usernameEdit;
|
||||||
|
QLineEdit *passwordEdit;
|
||||||
|
QCheckBox *savePasswordCheckBox;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // DLG_LOGIN_PROMPT_H
|
||||||
|
|
@ -0,0 +1,178 @@
|
||||||
|
#include "dlg_shared_decks_preview.h"
|
||||||
|
|
||||||
|
#include "../deck_share/shared_deck_preview_widget.h"
|
||||||
|
#include "../general/layout_containers/flow_widget.h"
|
||||||
|
|
||||||
|
#include <QCloseEvent>
|
||||||
|
#include <QDateTime>
|
||||||
|
#include <QDialogButtonBox>
|
||||||
|
#include <QLabel>
|
||||||
|
#include <QPushButton>
|
||||||
|
#include <QVBoxLayout>
|
||||||
|
#include <libcockatrice/card/database/card_database_querier.h>
|
||||||
|
#include <libcockatrice/protocol/pb/serverinfo_deck_share_item.pb.h>
|
||||||
|
|
||||||
|
DlgSharedDecksPreview::DlgSharedDecksPreview(QWidget *parent,
|
||||||
|
const CardDatabaseQuerier *querier,
|
||||||
|
const QString &shareName,
|
||||||
|
qint64 expiresAt,
|
||||||
|
const QString &serverText,
|
||||||
|
const QList<ServerInfo_DeckShareItem> &items)
|
||||||
|
: QDialog(parent)
|
||||||
|
{
|
||||||
|
setWindowTitle(tr("Open shared decks"));
|
||||||
|
resize(700, 500);
|
||||||
|
|
||||||
|
auto *mainLayout = new QVBoxLayout(this);
|
||||||
|
|
||||||
|
auto *titleLabel = new QLabel(tr("Share: %1").arg(shareName.isEmpty() ? tr("Untitled") : shareName), this);
|
||||||
|
QFont titleFont = titleLabel->font();
|
||||||
|
titleFont.setBold(true);
|
||||||
|
titleFont.setPointSize(titleFont.pointSize() + 2);
|
||||||
|
titleLabel->setFont(titleFont);
|
||||||
|
mainLayout->addWidget(titleLabel);
|
||||||
|
|
||||||
|
if (!serverText.isEmpty()) {
|
||||||
|
mainLayout->addWidget(new QLabel(tr("From %1").arg(serverText), this));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (expiresAt > 0) {
|
||||||
|
const QString expiryText = QDateTime::fromSecsSinceEpoch(expiresAt).toLocalTime().toString(Qt::TextDate);
|
||||||
|
mainLayout->addWidget(new QLabel(tr("This share link expires on %1").arg(expiryText), this));
|
||||||
|
}
|
||||||
|
|
||||||
|
downloadStatusLabel = new QLabel(this);
|
||||||
|
downloadStatusLabel->setVisible(false);
|
||||||
|
mainLayout->addWidget(downloadStatusLabel);
|
||||||
|
|
||||||
|
flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
|
||||||
|
mainLayout->addWidget(flowWidget, 1);
|
||||||
|
|
||||||
|
for (const ServerInfo_DeckShareItem &item : items) {
|
||||||
|
QStringList tags;
|
||||||
|
for (const auto &tag : item.tags()) {
|
||||||
|
tags.append(QString::fromStdString(tag));
|
||||||
|
}
|
||||||
|
|
||||||
|
auto *tile = new SharedDeckPreviewWidget(
|
||||||
|
this, querier, QString::fromStdString(item.name()), QString::fromStdString(item.banner_card()),
|
||||||
|
QString::fromStdString(item.color_identity()), QString::fromStdString(item.game_format()), tags.join(", "));
|
||||||
|
flowWidget->addWidget(tile);
|
||||||
|
tiles.append(tile);
|
||||||
|
itemIds.append(item.id());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tiles.size() == 1) {
|
||||||
|
tiles.first()->setSelected(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
auto *buttonBox = new QDialogButtonBox(this);
|
||||||
|
openSelectedButton = buttonBox->addButton(tr("Open selected"), QDialogButtonBox::AcceptRole);
|
||||||
|
openAllButton = buttonBox->addButton(tr("Open all"), QDialogButtonBox::ActionRole);
|
||||||
|
buttonBox->addButton(tr("Cancel"), QDialogButtonBox::RejectRole);
|
||||||
|
mainLayout->addWidget(buttonBox);
|
||||||
|
|
||||||
|
connect(buttonBox, &QDialogButtonBox::rejected, this, [this]() {
|
||||||
|
onCancel();
|
||||||
|
close();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Esc calls QDialog::reject() directly (which hides the dialog without a
|
||||||
|
// close event), so route it through the same guarded cancel as the button.
|
||||||
|
connect(this, &QDialog::rejected, this, [this]() {
|
||||||
|
onCancel();
|
||||||
|
close();
|
||||||
|
});
|
||||||
|
|
||||||
|
connect(openSelectedButton, &QPushButton::clicked, this, &DlgSharedDecksPreview::openSelected);
|
||||||
|
connect(buttonBox, &QDialogButtonBox::clicked, this, [this, buttonBox](QAbstractButton *button) {
|
||||||
|
if (buttonBox->buttonRole(button) == QDialogButtonBox::ActionRole) {
|
||||||
|
openAll();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
for (SharedDeckPreviewWidget *tile : tiles) {
|
||||||
|
connect(tile, &SharedDeckPreviewWidget::selectionToggled, this,
|
||||||
|
&DlgSharedDecksPreview::updateOpenSelectedEnabled);
|
||||||
|
}
|
||||||
|
for (int i = 0; i < tiles.size(); ++i) {
|
||||||
|
const int itemId = itemIds.at(i);
|
||||||
|
// Double-clicking a tile selects it and opens just that deck.
|
||||||
|
connect(tiles.at(i), &SharedDeckPreviewWidget::activated, this, [this, itemId]() {
|
||||||
|
resultEmitted = true;
|
||||||
|
setDownloading(true);
|
||||||
|
emit openRequested(QList<int>{itemId});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
updateOpenSelectedEnabled();
|
||||||
|
}
|
||||||
|
|
||||||
|
QList<int> DlgSharedDecksPreview::selectedItemIds() const
|
||||||
|
{
|
||||||
|
QList<int> selectedIds;
|
||||||
|
for (int i = 0; i < tiles.size(); ++i) {
|
||||||
|
if (tiles.at(i)->isSelected()) {
|
||||||
|
selectedIds.append(itemIds.at(i));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return selectedIds;
|
||||||
|
}
|
||||||
|
|
||||||
|
void DlgSharedDecksPreview::openSelected()
|
||||||
|
{
|
||||||
|
const QList<int> selectedIds = selectedItemIds();
|
||||||
|
if (selectedIds.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
resultEmitted = true;
|
||||||
|
setDownloading(true);
|
||||||
|
emit openRequested(selectedIds);
|
||||||
|
}
|
||||||
|
|
||||||
|
void DlgSharedDecksPreview::openAll()
|
||||||
|
{
|
||||||
|
resultEmitted = true;
|
||||||
|
setDownloading(true);
|
||||||
|
emit openRequested(itemIds);
|
||||||
|
}
|
||||||
|
|
||||||
|
void DlgSharedDecksPreview::setDownloading(bool downloading)
|
||||||
|
{
|
||||||
|
if (downloadInProgress == downloading) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
downloadInProgress = downloading;
|
||||||
|
downloadStatusLabel->setVisible(downloading);
|
||||||
|
for (SharedDeckPreviewWidget *tile : tiles) {
|
||||||
|
tile->setEnabled(!downloading);
|
||||||
|
}
|
||||||
|
openSelectedButton->setEnabled(!downloading);
|
||||||
|
openAllButton->setEnabled(!downloading);
|
||||||
|
}
|
||||||
|
|
||||||
|
void DlgSharedDecksPreview::setDownloadProgress(int done, int total, const QString ¤tDeckName)
|
||||||
|
{
|
||||||
|
if (!downloadInProgress) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
downloadStatusLabel->setText(tr("Downloading deck %1 of %2: %3").arg(done).arg(total).arg(currentDeckName));
|
||||||
|
}
|
||||||
|
|
||||||
|
void DlgSharedDecksPreview::updateOpenSelectedEnabled()
|
||||||
|
{
|
||||||
|
openSelectedButton->setEnabled(!selectedItemIds().isEmpty());
|
||||||
|
}
|
||||||
|
|
||||||
|
void DlgSharedDecksPreview::onCancel()
|
||||||
|
{
|
||||||
|
if (!resultEmitted || downloadInProgress) {
|
||||||
|
resultEmitted = true;
|
||||||
|
emit cancelled();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void DlgSharedDecksPreview::closeEvent(QCloseEvent *event)
|
||||||
|
{
|
||||||
|
onCancel();
|
||||||
|
QDialog::closeEvent(event);
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,68 @@
|
||||||
|
#ifndef COCKATRICE_DLG_SHARED_DECKS_PREVIEW_H
|
||||||
|
#define COCKATRICE_DLG_SHARED_DECKS_PREVIEW_H
|
||||||
|
|
||||||
|
#include <QDialog>
|
||||||
|
#include <QList>
|
||||||
|
|
||||||
|
class FlowWidget;
|
||||||
|
class QCloseEvent;
|
||||||
|
class QLabel;
|
||||||
|
class QPushButton;
|
||||||
|
class ServerInfo_DeckShareItem;
|
||||||
|
class SharedDeckPreviewWidget;
|
||||||
|
class CardDatabaseQuerier;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Non-modal preview of the decks contained in a shared-deck link.
|
||||||
|
*
|
||||||
|
* Lets the user pick which of the shared decks to open before anything is
|
||||||
|
* downloaded. Emits openRequested with the ids of the chosen decks, or
|
||||||
|
* cancelled when the user closes the dialog without choosing. Once the user
|
||||||
|
* picks, the dialog switches into a "downloading" state: the tiles and open
|
||||||
|
* buttons are disabled, a progress label shows the current download and Cancel
|
||||||
|
* stays functional so the download can be aborted.
|
||||||
|
*/
|
||||||
|
class DlgSharedDecksPreview : public QDialog
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit DlgSharedDecksPreview(QWidget *parent,
|
||||||
|
const CardDatabaseQuerier *querier,
|
||||||
|
const QString &shareName,
|
||||||
|
qint64 expiresAt,
|
||||||
|
const QString &serverText,
|
||||||
|
const QList<ServerInfo_DeckShareItem> &items);
|
||||||
|
|
||||||
|
void setDownloadProgress(int done, int total, const QString ¤tDeckName);
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
void setDownloading(bool downloading);
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void openRequested(const QList<int> &itemIds);
|
||||||
|
void cancelled();
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void closeEvent(QCloseEvent *event) override;
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void openSelected();
|
||||||
|
void openAll();
|
||||||
|
void updateOpenSelectedEnabled();
|
||||||
|
void onCancel();
|
||||||
|
|
||||||
|
private:
|
||||||
|
QList<int> selectedItemIds() const;
|
||||||
|
|
||||||
|
FlowWidget *flowWidget;
|
||||||
|
QList<SharedDeckPreviewWidget *> tiles;
|
||||||
|
QList<int> itemIds;
|
||||||
|
QPushButton *openSelectedButton;
|
||||||
|
QPushButton *openAllButton;
|
||||||
|
QLabel *downloadStatusLabel;
|
||||||
|
bool resultEmitted = false;
|
||||||
|
bool downloadInProgress = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // COCKATRICE_DLG_SHARED_DECKS_PREVIEW_H
|
||||||
|
|
@ -7,6 +7,7 @@
|
||||||
#include "flow_widget.h"
|
#include "flow_widget.h"
|
||||||
|
|
||||||
#include <QHBoxLayout>
|
#include <QHBoxLayout>
|
||||||
|
#include <QKeyEvent>
|
||||||
#include <QResizeEvent>
|
#include <QResizeEvent>
|
||||||
#include <QScrollArea>
|
#include <QScrollArea>
|
||||||
#include <QSizePolicy>
|
#include <QSizePolicy>
|
||||||
|
|
@ -177,6 +178,50 @@ QLayoutItem *FlowWidget::itemAt(int index) const
|
||||||
return flowLayout->itemAt(index);
|
return flowLayout->itemAt(index);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void FlowWidget::keyPressEvent(QKeyEvent *event)
|
||||||
|
{
|
||||||
|
// Keyboard navigation between the flow items: arrow keys move focus just
|
||||||
|
// like clicking the sibling tiles would. Only items that can take keyboard
|
||||||
|
// focus (e.g. the deck-preview tiles in shared-deck links) are visited.
|
||||||
|
const bool moveForward = event->key() == Qt::Key_Right || event->key() == Qt::Key_Down;
|
||||||
|
const bool moveBackward = event->key() == Qt::Key_Left || event->key() == Qt::Key_Up;
|
||||||
|
if (!moveForward && !moveBackward) {
|
||||||
|
QWidget::keyPressEvent(event);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
QList<QWidget *> focusableItems;
|
||||||
|
for (int i = 0; i < flowLayout->count(); ++i) {
|
||||||
|
QWidget *item = flowLayout->itemAt(i)->widget();
|
||||||
|
if (item != nullptr && (item->focusPolicy() & Qt::TabFocus)) {
|
||||||
|
focusableItems.append(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (focusableItems.isEmpty()) {
|
||||||
|
QWidget::keyPressEvent(event);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int currentIndex = -1;
|
||||||
|
for (int i = 0; i < focusableItems.size(); ++i) {
|
||||||
|
if (focusableItems.at(i)->hasFocus()) {
|
||||||
|
currentIndex = i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const int delta = moveForward ? 1 : -1;
|
||||||
|
int nextIndex;
|
||||||
|
if (currentIndex < 0) {
|
||||||
|
nextIndex = moveForward ? 0 : focusableItems.size() - 1;
|
||||||
|
} else {
|
||||||
|
nextIndex = (currentIndex + delta + focusableItems.size()) % focusableItems.size();
|
||||||
|
}
|
||||||
|
focusableItems.value(nextIndex)->setFocus();
|
||||||
|
event->accept();
|
||||||
|
}
|
||||||
|
|
||||||
int FlowWidget::count() const
|
int FlowWidget::count() const
|
||||||
{
|
{
|
||||||
return flowLayout->count();
|
return flowLayout->count();
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@
|
||||||
#include "../../../layouts/flow_layout.h"
|
#include "../../../layouts/flow_layout.h"
|
||||||
|
|
||||||
#include <QHBoxLayout>
|
#include <QHBoxLayout>
|
||||||
|
#include <QKeyEvent>
|
||||||
#include <QLoggingCategory>
|
#include <QLoggingCategory>
|
||||||
#include <QScrollArea>
|
#include <QScrollArea>
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
|
|
@ -44,6 +45,7 @@ public slots:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void resizeEvent(QResizeEvent *event) override;
|
void resizeEvent(QResizeEvent *event) override;
|
||||||
|
void keyPressEvent(QKeyEvent *event) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Qt::Orientation flowDirection;
|
Qt::Orientation flowDirection;
|
||||||
|
|
|
||||||
|
|
@ -512,6 +512,7 @@ MainWindow::MainWindow(QWidget *parent)
|
||||||
|
|
||||||
connectionController = new ConnectionController(this, this);
|
connectionController = new ConnectionController(this, this);
|
||||||
urlParser = new IntentUrlParser(this, this);
|
urlParser = new IntentUrlParser(this, this);
|
||||||
|
connect(urlParser, &IntentUrlParser::urlChainFinished, this, &MainWindow::onUrlChainFinished);
|
||||||
|
|
||||||
createActions();
|
createActions();
|
||||||
createMenus();
|
createMenus();
|
||||||
|
|
@ -728,6 +729,7 @@ void MainWindow::applyStartupDestination()
|
||||||
|
|
||||||
connect(credentials, &Intent::finished, connector, &Intent::execute);
|
connect(credentials, &Intent::finished, connector, &Intent::execute);
|
||||||
connect(credentials, &Intent::failed, this, &MainWindow::startupDestinationFailed);
|
connect(credentials, &Intent::failed, this, &MainWindow::startupDestinationFailed);
|
||||||
|
connect(credentials, &Intent::cancelled, this, [this]() { startupDestinationFailed(tr("Sign-in cancelled")); });
|
||||||
connect(connector, &Intent::finished, this,
|
connect(connector, &Intent::finished, this,
|
||||||
[this, destination, serverContext]() { onStartupDestinationConnected(destination, *serverContext); });
|
[this, destination, serverContext]() { onStartupDestinationConnected(destination, *serverContext); });
|
||||||
connect(connector, &Intent::failed, this, &MainWindow::startupDestinationFailed);
|
connect(connector, &Intent::failed, this, &MainWindow::startupDestinationFailed);
|
||||||
|
|
@ -879,18 +881,7 @@ void MainWindow::changeEvent(QEvent *event)
|
||||||
} else if (event->type() == QEvent::ActivationChange) {
|
} else if (event->type() == QEvent::ActivationChange) {
|
||||||
if (isActiveWindow() && !bHasActivated) {
|
if (isActiveWindow() && !bHasActivated) {
|
||||||
bHasActivated = true;
|
bHasActivated = true;
|
||||||
if (!connectTo.isEmpty()) {
|
attemptStartupAutoConnect();
|
||||||
qCInfo(WindowMainStartupAutoconnectLog) << "Command line connect to " << connectTo;
|
|
||||||
connectionController->connectToServerDirect(connectTo.host(), connectTo.port(), connectTo.userName(),
|
|
||||||
connectTo.password());
|
|
||||||
} else if (SettingsCache::instance().servers().getAutoConnect() &&
|
|
||||||
!SettingsCache::instance().debug().getLocalGameOnStartup() &&
|
|
||||||
!startupDestinationConnectsToServer()) {
|
|
||||||
qCInfo(WindowMainStartupAutoconnectLog) << "Attempting auto-connect...";
|
|
||||||
DlgConnect dlg(this);
|
|
||||||
connectionController->connectToServerDirect(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()),
|
|
||||||
dlg.getPlayerName(), dlg.getPassword());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -916,6 +907,40 @@ void MainWindow::handleCockatriceLink(const QString &url)
|
||||||
urlParser->handle(url);
|
urlParser->handle(url);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MainWindow::attemptStartupAutoConnect()
|
||||||
|
{
|
||||||
|
if (startupAutoConnectAttempted || skipStartupAutoConnect) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
startupAutoConnectAttempted = true;
|
||||||
|
|
||||||
|
if (!connectTo.isEmpty()) {
|
||||||
|
qCInfo(WindowMainStartupAutoconnectLog) << "Command line connect to " << connectTo;
|
||||||
|
connectionController->connectToServerDirect(connectTo.host(), connectTo.port(), connectTo.userName(),
|
||||||
|
connectTo.password());
|
||||||
|
} else if (SettingsCache::instance().servers().getAutoConnect() &&
|
||||||
|
!SettingsCache::instance().debug().getLocalGameOnStartup() && !startupDestinationConnectsToServer()) {
|
||||||
|
qCInfo(WindowMainStartupAutoconnectLog) << "Attempting auto-connect...";
|
||||||
|
DlgConnect dlg(this);
|
||||||
|
connectionController->connectToServerDirect(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()),
|
||||||
|
dlg.getPlayerName(), dlg.getPassword());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void MainWindow::onUrlChainFinished(bool connected)
|
||||||
|
{
|
||||||
|
// A cockatrice:// link owns the startup connection while it runs. When its
|
||||||
|
// chain ended without connecting (declined, invalid, offline), fall back to
|
||||||
|
// the startup connection so the activation launch still behaves like a
|
||||||
|
// normal launch.
|
||||||
|
if (connected || !skipStartupAutoConnect || getRemoteClient()->getStatus() != StatusDisconnected) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
qCInfo(WindowMainStartupAutoconnectLog) << "URL chain ended without a connection; retrying startup connect";
|
||||||
|
skipStartupAutoConnect = false;
|
||||||
|
attemptStartupAutoConnect();
|
||||||
|
}
|
||||||
|
|
||||||
void MainWindow::cardDatabaseLoadingFailed()
|
void MainWindow::cardDatabaseLoadingFailed()
|
||||||
{
|
{
|
||||||
if (askedForDbUpdater) {
|
if (askedForDbUpdater) {
|
||||||
|
|
|
||||||
|
|
@ -80,6 +80,7 @@ public slots:
|
||||||
void actCheckClientUpdates();
|
void actCheckClientUpdates();
|
||||||
void actConnect();
|
void actConnect();
|
||||||
void actExit();
|
void actExit();
|
||||||
|
void handleCockatriceLink(const QString &url);
|
||||||
private slots:
|
private slots:
|
||||||
void updateTabMenu(const QList<QMenu *> &newMenuList);
|
void updateTabMenu(const QList<QMenu *> &newMenuList);
|
||||||
void statusChanged(ClientStatus _status);
|
void statusChanged(ClientStatus _status);
|
||||||
|
|
@ -97,7 +98,7 @@ private slots:
|
||||||
void actOpenSettingsFolder();
|
void actOpenSettingsFolder();
|
||||||
void actShow();
|
void actShow();
|
||||||
void showWindowIfHidden();
|
void showWindowIfHidden();
|
||||||
void handleCockatriceLink(const QString &url);
|
void onUrlChainFinished(bool connected);
|
||||||
|
|
||||||
void cardUpdateError(QProcess::ProcessError err);
|
void cardUpdateError(QProcess::ProcessError err);
|
||||||
void cardUpdateFinished(int exitCode, QProcess::ExitStatus exitStatus);
|
void cardUpdateFinished(int exitCode, QProcess::ExitStatus exitStatus);
|
||||||
|
|
@ -126,6 +127,8 @@ private slots:
|
||||||
void startupDestinationFailed(const QString &reason);
|
void startupDestinationFailed(const QString &reason);
|
||||||
[[nodiscard]] bool startupDestinationConnectsToServer() const;
|
[[nodiscard]] bool startupDestinationConnectsToServer() const;
|
||||||
|
|
||||||
|
void attemptStartupAutoConnect();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static const QString appName;
|
static const QString appName;
|
||||||
static const QStringList fileNameFilters;
|
static const QStringList fileNameFilters;
|
||||||
|
|
@ -164,6 +167,8 @@ private:
|
||||||
LagMonitor lagMonitor; ///< watches the main thread for event loop stalls
|
LagMonitor lagMonitor; ///< watches the main thread for event loop stalls
|
||||||
LatencyStatusWidget *latencyStatus = nullptr; ///< status bar widget with live round-trip stats and history graph
|
LatencyStatusWidget *latencyStatus = nullptr; ///< status bar widget with live round-trip stats and history graph
|
||||||
bool bHasActivated, askedForDbUpdater;
|
bool bHasActivated, askedForDbUpdater;
|
||||||
|
bool skipStartupAutoConnect = false;
|
||||||
|
bool startupAutoConnectAttempted = false;
|
||||||
QProcess *cardUpdateProcess;
|
QProcess *cardUpdateProcess;
|
||||||
QByteArray cardUpdateOutputBuffer;
|
QByteArray cardUpdateOutputBuffer;
|
||||||
DlgViewLog *logviewDialog;
|
DlgViewLog *logviewDialog;
|
||||||
|
|
@ -177,6 +182,16 @@ public:
|
||||||
{
|
{
|
||||||
connectTo = QUrl(QString("cockatrice://%1").arg(url));
|
connectTo = QUrl(QString("cockatrice://%1").arg(url));
|
||||||
}
|
}
|
||||||
|
// When set, the window's own startup connection (--connect or auto-connect
|
||||||
|
// on first activation) is skipped. Used for activation launches: the intent
|
||||||
|
// chain triggered by a cockatrice:// URL owns the connection, and letting
|
||||||
|
// auto-connect race against it caused two connectToServer calls to tear
|
||||||
|
// each other down. onUrlChainFinished() clears this and retries the startup
|
||||||
|
// connection when the link's chain ended without connecting.
|
||||||
|
void setSkipStartupAutoConnect(bool skip)
|
||||||
|
{
|
||||||
|
skipStartupAutoConnect = skip;
|
||||||
|
}
|
||||||
~MainWindow() override;
|
~MainWindow() override;
|
||||||
|
|
||||||
RemoteClient *getRemoteClient() const
|
RemoteClient *getRemoteClient() const
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,6 @@
|
||||||
#include "client/url_scheme_event_filter.h"
|
#include "client/url_scheme_event_filter.h"
|
||||||
#include "database/interface/settings_card_preference_provider.h"
|
#include "database/interface/settings_card_preference_provider.h"
|
||||||
#include "interface/intents/intent_open_local_deck.h"
|
#include "interface/intents/intent_open_local_deck.h"
|
||||||
#include "interface/intents/url_parser.h"
|
|
||||||
#include "interface/logger.h"
|
#include "interface/logger.h"
|
||||||
#include "interface/pixel_map_generator.h"
|
#include "interface/pixel_map_generator.h"
|
||||||
#include "interface/theme_manager.h"
|
#include "interface/theme_manager.h"
|
||||||
|
|
@ -45,6 +44,7 @@
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QSystemTrayIcon>
|
#include <QSystemTrayIcon>
|
||||||
#include <QTranslator>
|
#include <QTranslator>
|
||||||
|
#include <algorithm>
|
||||||
#include <libcockatrice/card/database/card_database_manager.h>
|
#include <libcockatrice/card/database/card_database_manager.h>
|
||||||
#include <libcockatrice/rng/rng_sfmt.h>
|
#include <libcockatrice/rng/rng_sfmt.h>
|
||||||
#include <libcockatrice/settings/appearance_settings.h>
|
#include <libcockatrice/settings/appearance_settings.h>
|
||||||
|
|
@ -273,10 +273,12 @@ int main(int argc, char *argv[])
|
||||||
SingleInstanceManager instance;
|
SingleInstanceManager instance;
|
||||||
|
|
||||||
if (hasActivationFiles) {
|
if (hasActivationFiles) {
|
||||||
|
qInfo() << "Activation launch, files:" << startupFiles;
|
||||||
// Activation launch: hand off to the primary instance if one is
|
// Activation launch: hand off to the primary instance if one is
|
||||||
// running, otherwise become the primary ourselves. Do this before
|
// running, otherwise become the primary ourselves. Do this before
|
||||||
// constructing the main window so a hand-off exits cheaply.
|
// constructing the main window so a hand-off exits cheaply.
|
||||||
if (!instance.tryRun(startupFiles)) {
|
if (!instance.tryRun(startupFiles)) {
|
||||||
|
qInfo() << "Handed off to a running instance, exiting";
|
||||||
// Sent successfully → exit
|
// Sent successfully → exit
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
@ -325,10 +327,22 @@ int main(int argc, char *argv[])
|
||||||
|
|
||||||
MainWindow ui;
|
MainWindow ui;
|
||||||
|
|
||||||
|
// A URL launch must own the connection: the intent chain triggered by the
|
||||||
|
// URL connects to the server named in the URL, so the window's own startup
|
||||||
|
// auto-connect must not race against it (two connectToServer calls tear
|
||||||
|
// each other down via doDisconnectFromServer).
|
||||||
|
const bool hasUrlActivation = std::any_of(startupFiles.begin(), startupFiles.end(), [](const QString &file) {
|
||||||
|
return file.startsWith(QStringLiteral("cockatrice://"));
|
||||||
|
});
|
||||||
|
ui.setSkipStartupAutoConnect(hasUrlActivation);
|
||||||
|
|
||||||
auto handleActivation = [&ui](const QString &file) {
|
auto handleActivation = [&ui](const QString &file) {
|
||||||
if (file.startsWith("cockatrice://")) {
|
if (file.startsWith("cockatrice://")) {
|
||||||
auto urlParser = new IntentUrlParser(&ui, &ui);
|
qInfo() << "Handling URL activation:" << file;
|
||||||
urlParser->handle(file);
|
// Route through the window's persistent url parser: it serializes
|
||||||
|
// link chains so activations handed over while another chain is
|
||||||
|
// still connecting do not connect concurrently.
|
||||||
|
ui.handleCockatriceLink(file);
|
||||||
} else if (QFileInfo(file).exists()) {
|
} else if (QFileInfo(file).exists()) {
|
||||||
auto openDeckIntent = new IntentOpenLocalDeck(ui.getTabSupervisor(), file);
|
auto openDeckIntent = new IntentOpenLocalDeck(ui.getTabSupervisor(), file);
|
||||||
QObject::connect(openDeckIntent, &Intent::failed, &ui, [&ui](const QString &reason) {
|
QObject::connect(openDeckIntent, &Intent::failed, &ui, [&ui](const QString &reason) {
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,14 @@
|
||||||
|
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
|
|
||||||
|
namespace
|
||||||
|
{
|
||||||
|
// Sent by the primary instance after it has read a forwarded payload. Without
|
||||||
|
// an acknowledgment, a second instance cannot tell a live primary apart from a
|
||||||
|
// stale socket left behind by a process that is still shutting down.
|
||||||
|
const QByteArray ACK_MESSAGE = QByteArrayLiteral("COCKATRICE_ACK");
|
||||||
|
} // namespace
|
||||||
|
|
||||||
SingleInstanceManager::SingleInstanceManager(QObject *parent) : QObject(parent)
|
SingleInstanceManager::SingleInstanceManager(QObject *parent) : QObject(parent)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
@ -72,7 +80,14 @@ bool SingleInstanceManager::forwardToPrimary(const QStringList &filesToSend)
|
||||||
socket.flush();
|
socket.flush();
|
||||||
socket.waitForBytesWritten(1000);
|
socket.waitForBytesWritten(1000);
|
||||||
|
|
||||||
return true;
|
// Only report a successful hand-off once the primary has acknowledged that
|
||||||
|
// it actually read the payload. A socket that connects but never answers
|
||||||
|
// belongs to a process that is dying, so the caller must not treat this as
|
||||||
|
// a hand-off (otherwise it would exit without anyone handling the files).
|
||||||
|
if (!socket.waitForReadyRead(1000)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return socket.readAll() == ACK_MESSAGE;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SingleInstanceManager::handleNewConnection()
|
void SingleInstanceManager::handleNewConnection()
|
||||||
|
|
@ -111,6 +126,14 @@ void SingleInstanceManager::handleNewConnection()
|
||||||
QStringList files;
|
QStringList files;
|
||||||
payloadStream >> files;
|
payloadStream >> files;
|
||||||
|
|
||||||
|
// Acknowledge receipt as soon as the payload is parsed, before the
|
||||||
|
// primary starts handling it. The handlers run synchronously and can
|
||||||
|
// take longer than the sender's readiness timeout (e.g. a modal
|
||||||
|
// confirmation box), which would otherwise make a live primary look
|
||||||
|
// dead and cause duplicate handling.
|
||||||
|
socket->write(ACK_MESSAGE);
|
||||||
|
socket->flush();
|
||||||
|
|
||||||
emit filesReceived(files);
|
emit filesReceived(files);
|
||||||
|
|
||||||
// Reset buffer (single message use-case)
|
// Reset buffer (single message use-case)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue