dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-12-16 04:09:07 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Clans: fmt::format instead of std::format

Browse Source 
- Renamed some fields
- Implemented fmt::format for consistency
- Made some constant fields `const`
This commit is contained in:
zeph 2025-12-08 13:10:14 +01:00
parent ae34ee9c71
commit 7378657c4b
4 changed files with 112 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
rpcs3/Emu/NP/clans_client.cpp
View File

@ -1,114 +1,112 @@
#include "Utilities/StrUtil.h"
#include "stdafx.h"
#include "util/types.hpp"
#include <Crypto/utils.h>
#include <Emu/NP/clans_client.h>
#include <Emu/NP/clans_config.h>
#include <format>
#include <util/types.hpp>
#include <wolfssl/wolfcrypt/coding.h>
LOG_CHANNEL(clan_log, "clans");
#include <Crypto/utils.h>
#include <Utilities/StrUtil.h>
#include <Utilities/StrFmt.h>
#include <Emu/NP/clans_client.h>
#include <Emu/NP/clans_config.h>
LOG_CHANNEL(clan_log, "clans");
const char* REQ_TYPE_FUNC = "func";
const char* REQ_TYPE_SEC = "sec";
constexpr const char* JID_FORMAT = "%s@un.br.np.playstation.net";
constexpr const char JID_FORMAT[] = "%s@un.br.np.playstation.net";
const char* CLANS_SERVICE_ID = "IV0001-NPXS01001_00";
const char* CLANS_ENTITLEMENT_ID = "NPWR00432_00";
namespace std
template <>
void fmt_class_string<clan::ClanRequestType>::format(std::string& out, u64 arg)
{
template <>
struct formatter<clan::ClanRequestType> : formatter<string>
{
auto format(clan::ClanRequestType value, format_context& ctx) const
format_enum(out, arg, [](auto value)
{
string_view name = "unknown";
switch (value)
{
case clan::ClanRequestType::FUNC: name = "func"; break;
case clan::ClanRequestType::SEC: name = "sec"; break;
case clan::ClanRequestType::FUNC: return "func";
case clan::ClanRequestType::SEC: return "sec";
}
return formatter<string>::format(string(name), ctx);
}
};
template <>
struct formatter<clan::ClanManagerOperationType> : formatter<string>
{
auto format(clan::ClanManagerOperationType value, format_context& ctx) const
{
string_view name = "unknown";
switch (value)
{
case clan::ClanManagerOperationType::VIEW: name = "view"; break;
case clan::ClanManagerOperationType::UPDATE: name = "update"; break;
}
return formatter<string>::format(string(name), ctx);
}
};
return unknown;
});
}
template <>
struct formatter<clan::ClanSearchFilterOperator> : formatter<string>
{
auto format(clan::ClanSearchFilterOperator value, format_context& ctx) const
template <>
void fmt_class_string<clan::ClanManagerOperationType>::format(std::string& out, u64 arg)
{
format_enum(out, arg, [](auto value)
{
string_view name = "unknown";
switch (value)
{
case clan::ClanSearchFilterOperator::Equal: name = "eq"; break;
case clan::ClanSearchFilterOperator::NotEqual: name = "ne"; break;
case clan::ClanSearchFilterOperator::GreaterThan: name = "gt"; break;
case clan::ClanSearchFilterOperator::GreaterThanOrEqual: name = "ge"; break;
case clan::ClanSearchFilterOperator::LessThan: name = "lt"; break;
case clan::ClanSearchFilterOperator::LessThanOrEqual: name = "le"; break;
case clan::ClanSearchFilterOperator::Like: name = "lk"; break;
case clan::ClanManagerOperationType::VIEW: return "view";
case clan::ClanManagerOperationType::UPDATE: return "update";
}
return formatter<string>::format(string(name), ctx);
}
};
template <>
struct formatter<clan::ClanRequestAction> : formatter<string>
{
auto format(clan::ClanRequestAction value, format_context& ctx) const
return unknown;
});
}
template <>
void fmt_class_string<clan::ClanSearchFilterOperator>::format(std::string& out, u64 arg)
{
format_enum(out, arg, [](auto value)
{
string_view name = "unknown";
switch (value)
{
case clan::ClanRequestAction::GetClanList: name = "get_clan_list"; break;
case clan::ClanRequestAction::GetClanInfo: name = "get_clan_info"; break;
case clan::ClanRequestAction::GetMemberInfo: name = "get_member_info"; break;
case clan::ClanRequestAction::GetMemberList: name = "get_member_list"; break;
case clan::ClanRequestAction::GetBlacklist: name = "get_blacklist"; break;
case clan::ClanRequestAction::RecordBlacklistEntry: name = "record_blacklist_entry"; break;
case clan::ClanRequestAction::DeleteBlacklistEntry: name = "delete_blacklist_entry"; break;
case clan::ClanRequestAction::ClanSearch: name = "clan_search"; break;
case clan::ClanRequestAction::RequestMembership: name = "request_membership"; break;
case clan::ClanRequestAction::CancelRequestMembership: name = "cancel_request_membership"; break;
case clan::ClanRequestAction::AcceptMembershipRequest: name = "accept_membership_request"; break;
case clan::ClanRequestAction::DeclineMembershipRequest: name = "decline_membership_request"; break;
case clan::ClanRequestAction::SendInvitation: name = "send_invitation"; break;
case clan::ClanRequestAction::CancelInvitation: name = "cancel_invitation"; break;
case clan::ClanRequestAction::AcceptInvitation: name = "accept_invitation"; break;
case clan::ClanRequestAction::DeclineInvitation: name = "decline_invitation"; break;
case clan::ClanRequestAction::UpdateMemberInfo: name = "update_member_info"; break;
case clan::ClanRequestAction::UpdateClanInfo: name = "update_clan_info"; break;
case clan::ClanRequestAction::JoinClan: name = "join_clan"; break;
case clan::ClanRequestAction::LeaveClan: name = "leave_clan"; break;
case clan::ClanRequestAction::KickMember: name = "kick_member"; break;
case clan::ClanRequestAction::ChangeMemberRole: name = "change_member_role"; break;
case clan::ClanRequestAction::RetrieveAnnouncements: name = "retrieve_announcements"; break;
case clan::ClanRequestAction::PostAnnouncement: name = "post_announcement"; break;
case clan::ClanRequestAction::DeleteAnnouncement: name = "delete_announcement"; break;
case clan::ClanSearchFilterOperator::Equal: return "eq";
case clan::ClanSearchFilterOperator::NotEqual: return "ne";
case clan::ClanSearchFilterOperator::GreaterThan: return "gt";
case clan::ClanSearchFilterOperator::GreaterThanOrEqual: return "ge";
case clan::ClanSearchFilterOperator::LessThan: return "lt";
case clan::ClanSearchFilterOperator::LessThanOrEqual: return "le";
case clan::ClanSearchFilterOperator::Like: return "lk";
}
return formatter<string>::format(string(name), ctx);
}
};
return unknown;
});
}
template <>
void fmt_class_string<clan::ClanRequestAction>::format(std::string& out, u64 arg)
{
format_enum(out, arg, [](auto value)
{
switch (value)
{
case clan::ClanRequestAction::GetClanList: return "get_clan_list";
case clan::ClanRequestAction::GetClanInfo: return "get_clan_info";
case clan::ClanRequestAction::GetMemberInfo: return "get_member_info";
case clan::ClanRequestAction::GetMemberList: return "get_member_list";
case clan::ClanRequestAction::GetBlacklist: return "get_blacklist";
case clan::ClanRequestAction::RecordBlacklistEntry: return "record_blacklist_entry";
case clan::ClanRequestAction::DeleteBlacklistEntry: return "delete_blacklist_entry";
case clan::ClanRequestAction::ClanSearch: return "clan_search";
case clan::ClanRequestAction::RequestMembership: return "request_membership";
case clan::ClanRequestAction::CancelRequestMembership: return "cancel_request_membership";
case clan::ClanRequestAction::AcceptMembershipRequest: return "accept_membership_request";
case clan::ClanRequestAction::DeclineMembershipRequest: return "decline_membership_request";
case clan::ClanRequestAction::SendInvitation: return "send_invitation";
case clan::ClanRequestAction::CancelInvitation: return "cancel_invitation";
case clan::ClanRequestAction::AcceptInvitation: return "accept_invitation";
case clan::ClanRequestAction::DeclineInvitation: return "decline_invitation";
case clan::ClanRequestAction::UpdateMemberInfo: return "update_member_info";
case clan::ClanRequestAction::UpdateClanInfo: return "update_clan_info";
case clan::ClanRequestAction::JoinClan: return "join_clan";
case clan::ClanRequestAction::LeaveClan: return "leave_clan";
case clan::ClanRequestAction::KickMember: return "kick_member";
case clan::ClanRequestAction::ChangeMemberRole: return "change_member_role";
case clan::ClanRequestAction::RetrieveAnnouncements: return "retrieve_announcements";
case clan::ClanRequestAction::PostAnnouncement: return "post_announcement";
case clan::ClanRequestAction::DeleteAnnouncement: return "delete_announcement";
}
return unknown;
});
}
namespace clan
@ -184,7 +182,7 @@ namespace clan
std::string host = g_cfg_clans.get_host();
std::string protocol = g_cfg_clans.get_use_https() ? "https" : "http";
std::string url = std::format("{}://{}/clan_manager_{}/{}/{}", protocol, host, opType, reqType, action);
std::string url = fmt::format("%s://%s/clan_manager_%s/%s/%s", protocol, host, opType, reqType, action);
std::ostringstream oss;
xmlBody->save(oss, "\t", 8U);
@ -412,7 +410,7 @@ namespace clan
clan.append_child("ticket").text().set(ticket.c_str());
clan.append_child("id").text().set(clanId);
std::string jid_str = std::format(JID_FORMAT, npId.handle.data);
std::string jid_str = fmt::format(JID_FORMAT, npId.handle.data);
clan.append_child("jid").text().set(jid_str.c_str());
pugi::xml_document response = pugi::xml_document();
@ -620,7 +618,7 @@ namespace clan
clan.append_child("ticket").text().set(ticket.c_str());
clan.append_child("id").text().set(clanId);
std::string jid_str = std::format(JID_FORMAT, npId.handle.data);
std::string jid_str = fmt::format(JID_FORMAT, npId.handle.data);
clan.append_child("jid").text().set(jid_str.c_str());
pugi::xml_document response = pugi::xml_document();
@ -636,7 +634,7 @@ namespace clan
clan.append_child("ticket").text().set(ticket.c_str());
clan.append_child("id").text().set(clanId);
std::string jid_str = std::format(JID_FORMAT, npId.handle.data);
std::string jid_str = fmt::format(JID_FORMAT, npId.handle.data);
clan.append_child("jid").text().set(jid_str.c_str());
pugi::xml_document response = pugi::xml_document();
@ -653,7 +651,7 @@ namespace clan
pugi::xml_node filter = clan.append_child("filter");
pugi::xml_node name = filter.append_child("name");
std::string op_name = std::format("{}", static_cast<ClanSearchFilterOperator>(static_cast<s32>(search->nameSearchOp)));
std::string op_name = fmt::format("%s", static_cast<ClanSearchFilterOperator>(static_cast<s32>(search->nameSearchOp)));
name.append_attribute("op").set_value(op_name.c_str());
name.append_attribute("value").set_value(search->name);
@ -740,7 +738,7 @@ namespace clan
clan.append_child("ticket").text().set(ticket.c_str());
clan.append_child("id").text().set(clanId);
std::string jid_str = std::format(JID_FORMAT, npId.handle.data);
std::string jid_str = fmt::format(JID_FORMAT, npId.handle.data);
clan.append_child("jid").text().set(jid_str.c_str());
pugi::xml_document response = pugi::xml_document();
@ -756,7 +754,7 @@ namespace clan
clan.append_child("ticket").text().set(ticket.c_str());
clan.append_child("id").text().set(clanId);
std::string jid_str = std::format(JID_FORMAT, npId.handle.data);
std::string jid_str = fmt::format(JID_FORMAT, npId.handle.data);
clan.append_child("jid").text().set(jid_str.c_str());
pugi::xml_document response = pugi::xml_document();
@ -772,7 +770,7 @@ namespace clan
clan.append_child("ticket").text().set(ticket.c_str());
clan.append_child("id").text().set(clanId);
std::string jid_str = std::format(JID_FORMAT, npId.handle.data);
std::string jid_str = fmt::format(JID_FORMAT, npId.handle.data);
clan.append_child("jid").text().set(jid_str.c_str());
pugi::xml_document response = pugi::xml_document();
@ -882,7 +880,7 @@ namespace clan
clan.append_child("ticket").text().set(ticket.c_str());
clan.append_child("id").text().set(clanId);
std::string jid_str = std::format(JID_FORMAT, npId.handle.data);
std::string jid_str = fmt::format(JID_FORMAT, npId.handle.data);
clan.append_child("jid").text().set(jid_str.c_str());
pugi::xml_document response = pugi::xml_document();
@ -898,7 +896,7 @@ namespace clan
clan.append_child("ticket").text().set(ticket.c_str());
clan.append_child("id").text().set(clanId);
std::string jid_str = std::format(JID_FORMAT, npId.handle.data);
std::string jid_str = fmt::format(JID_FORMAT, npId.handle.data);
clan.append_child("jid").text().set(jid_str.c_str());
pugi::xml_node roleNode = clan.append_child("role");

8
rpcs3/Emu/NP/clans_config.cpp
View File

@ -59,11 +59,11 @@ bool cfg_clans::get_use_https() const
std::vector<std::pair<std::string, std::string>> cfg_clans::get_hosts()
{
std::vector<std::pair<std::string, std::string>> vec_hosts;
auto hosts_list = fmt::split(hosts.to_string(), {"|||"});
const auto hosts_list = fmt::split(hosts.to_string(), {"|||"});
for (const auto& cur_host : hosts_list)
{
auto desc_and_host = fmt::split(cur_host, {"|"});
const auto desc_and_host = fmt::split(cur_host, {"|"});
if (desc_and_host.size() != 2)
{
clans_config_log.error("Invalid host in the list of hosts: %s", cur_host);
@ -129,7 +129,9 @@ bool cfg_clans::add_host(std::string_view new_description, std::string_view new_
bool cfg_clans::del_host(std::string_view del_description, std::string_view del_host)
{
// Do not delete default servers
if (del_description == "Official Clans Server" && del_host == "clans.rpcs3.net")
const auto def_desc_and_host = fmt::split(hosts.def, {"|"});
ensure(def_desc_and_host.size() == 2);
if (del_description == def_desc_and_host[0] && del_host == def_desc_and_host[1])
{
return true;
}

32
rpcs3/rpcs3qt/clans_settings_dialog.cpp
View File

@ -31,18 +31,18 @@ clans_settings_dialog::clans_settings_dialog(QWidget* parent)
QHBoxLayout* hbox_lbl_combo = new QHBoxLayout();
QLabel* lbl_server = new QLabel(tr("Server:"));
cbx_servers = new QComboBox();
cbx_protocol = new QComboBox();
m_cbx_servers = new QComboBox();
m_cbx_protocol = new QComboBox();
cbx_protocol->addItem("HTTPS");
cbx_protocol->addItem("HTTP");
cbx_protocol->setCurrentIndex(g_cfg_clans.get_use_https() ? 0 : 1);
m_cbx_protocol->addItem("HTTPS");
m_cbx_protocol->addItem("HTTP");
m_cbx_protocol->setCurrentIndex(g_cfg_clans.get_use_https() ? 0 : 1);
refresh_combobox();
hbox_lbl_combo->addWidget(lbl_server);
hbox_lbl_combo->addWidget(cbx_servers);
hbox_lbl_combo->addWidget(cbx_protocol);
hbox_lbl_combo->addWidget(m_cbx_servers);
hbox_lbl_combo->addWidget(m_cbx_protocol);
QHBoxLayout* hbox_buttons = new QHBoxLayout();
QPushButton* btn_add_server = new QPushButton(tr("Add"));
@ -59,12 +59,12 @@ clans_settings_dialog::clans_settings_dialog(QWidget* parent)
setLayout(vbox_global);
connect(cbx_servers, &QComboBox::currentIndexChanged, this, [this](int index)
connect(m_cbx_servers, &QComboBox::currentIndexChanged, this, [this](int index)
{
if (index < 0)
return;
QVariant host = cbx_servers->itemData(index);
QVariant host = m_cbx_servers->itemData(index);
if (!host.isValid() || !host.canConvert<QString>())
return;
@ -73,7 +73,7 @@ clans_settings_dialog::clans_settings_dialog(QWidget* parent)
g_cfg_clans.save();
});
connect(cbx_protocol, &QComboBox::currentIndexChanged, this, [this](int index)
connect(m_cbx_protocol, &QComboBox::currentIndexChanged, this, [this](int index)
{
if (index < 0)
return;
@ -102,13 +102,13 @@ clans_settings_dialog::clans_settings_dialog(QWidget* parent)
connect(btn_del_server, &QAbstractButton::clicked, this, [this]()
{
const int index = cbx_servers->currentIndex();
const int index = m_cbx_servers->currentIndex();
if (index < 0)
return;
const std::string desc = cbx_servers->itemText(index).toStdString();
const std::string host = cbx_servers->itemData(index).toString().toStdString();
const std::string desc = m_cbx_servers->itemText(index).toStdString();
const std::string host = m_cbx_servers->itemData(index).toString().toStdString();
if (g_cfg_clans.del_host(desc, host))
{
@ -129,18 +129,18 @@ void clans_settings_dialog::refresh_combobox()
const auto cur_host = g_cfg_clans.get_host();
int i = 0, index = 0;
cbx_servers->clear();
m_cbx_servers->clear();
for (const auto& [desc, host] : vec_hosts)
{
cbx_servers->addItem(QString::fromStdString(desc), QString::fromStdString(host));
m_cbx_servers->addItem(QString::fromStdString(desc), QString::fromStdString(host));
if (cur_host == host)
index = i;
i++;
}
cbx_servers->setCurrentIndex(index);
m_cbx_servers->setCurrentIndex(index);
}
clans_add_server_dialog::clans_add_server_dialog(QWidget* parent)

4
rpcs3/rpcs3qt/clans_settings_dialog.h
View File

@ -14,8 +14,8 @@ private:
void refresh_combobox();
private:
QComboBox* cbx_servers = nullptr;
QComboBox* cbx_protocol = nullptr;
QComboBox* m_cbx_servers = nullptr;
QComboBox* m_cbx_protocol = nullptr;
};
class clans_add_server_dialog : public QDialog