Skip to content
Permalink
Browse files

Qt/NetPlay: Show feedback for index adding

  • Loading branch information...
spycrab committed Apr 10, 2019
1 parent d90d641 commit 8b6bb39e82b66c0faa7ac29512b3f68167874404
@@ -64,6 +64,9 @@ class NetPlayUI
virtual void SetMD5Result(int pid, const std::string& result) = 0;
virtual void AbortMD5() = 0;

virtual void OnIndexAdded(bool success, std::string error) = 0;
virtual void OnIndexRefreshFailed(std::string error) = 0;

virtual void ShowChunkedProgressDialog(const std::string& title, u64 data_size,
const std::vector<int>& players) = 0;
virtual void HideChunkedProgressDialog() = 0;
@@ -183,6 +183,9 @@ void NetPlayServer::SetupIndex()

if (m_traversal_client)
{
if (m_traversal_client->GetState() != TraversalClient::Connected)
return;

session.server_id = std::string(g_TraversalClient->GetHostID().data(), 8);
}
else
@@ -201,7 +204,13 @@ void NetPlayServer::SetupIndex()

session.EncryptID(Config::Get(Config::NETPLAY_INDEX_PASSWORD));

m_index.Add(session);
if (m_dialog != nullptr)
m_dialog->OnIndexAdded(m_index.Add(session), m_index.GetLastError());

m_index.SetErrorCallback([this] {
if (m_dialog != nullptr)
m_dialog->OnIndexRefreshFailed(m_index.GetLastError());
});
}

// called from ---NETPLAY--- thread
@@ -393,6 +393,19 @@ void NetPlayDialog::OnChat()
});
}

void NetPlayDialog::OnIndexAdded(bool success, const std::string error)
{
DisplayMessage(success ? tr("Successfully added to the NetPlay index") :
tr("Failed to add this session to the NetPlay index: %1")
.arg(QString::fromStdString(error)),
success ? "green" : "red");
}

void NetPlayDialog::OnIndexRefreshFailed(const std::string error)
{
DisplayMessage(QString::fromStdString(error), "red");
}

void NetPlayDialog::OnStart()
{
if (!Settings::Instance().GetNetPlayClient()->DoAllPlayersHaveGame())
@@ -60,6 +60,9 @@ class NetPlayDialog : public QDialog, public NetPlay::NetPlayUI
void OnGameStartAborted() override;
void OnGolferChanged(bool is_golfer, const std::string& golfer_name) override;

void OnIndexAdded(bool success, const std::string error) override;
void OnIndexRefreshFailed(const std::string error) override;

bool IsRecording() override;
std::string FindGame(const std::string& game) override;
std::shared_ptr<const UICommon::GameFile> FindGameFile(const std::string& game) override;
@@ -142,6 +142,8 @@ void NetPlayIndex::NotificationLoop()
if (!json)
{
m_last_error = "BAD_JSON";
m_secret.clear();
m_error_callback();
return;
}

@@ -150,6 +152,8 @@ void NetPlayIndex::NotificationLoop()
if (status != "OK")
{
m_last_error = std::move(status);
m_secret.clear();
m_error_callback();
return;
}
}
@@ -318,3 +322,13 @@ const std::string& NetPlayIndex::GetLastError() const
{
return m_last_error;
}

bool NetPlayIndex::HasActiveSession() const
{
return !m_secret.empty();
}

void NetPlayIndex::SetErrorCallback(std::function<void()> function)
{
m_error_callback = function;
}
@@ -4,6 +4,7 @@

#pragma once

#include <functional>
#include <map>
#include <optional>
#include <string>
@@ -46,12 +47,16 @@ class NetPlayIndex
bool Add(NetPlaySession session);
void Remove();

bool HasActiveSession() const;

void SetPlayerCount(int player_count);
void SetInGame(bool in_game);
void SetGame(std::string game);

const std::string& GetLastError() const;

void SetErrorCallback(std::function<void()> callback);

private:
void NotificationLoop();

@@ -64,4 +69,6 @@ class NetPlayIndex
std::thread m_session_thread;

Common::Event m_session_thread_exit_event;

std::function<void()> m_error_callback = nullptr;
};

0 comments on commit 8b6bb39

Please sign in to comment.
You can’t perform that action at this time.