ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make /liststkaddon, /listlocaladdon, /listserveraddon more friendly (#4181)

Browse Source 
* make /liststkaddon, /listlocaladdon, /listserveraddon more friendly

* remove debug code
This commit is contained in:
riso 2019-12-25 21:14:09 -06:00 committed by Benau
parent de33244ae7
commit d00ffe72b9
2 changed files with 116 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/network/protocols/client_lobby.cpp
View File

@ -1536,10 +1536,12 @@ void ClientLobby::handleClientCommand(const std::string& cmd)
} }
else if (argv[0] == "liststkaddon") else if (argv[0] == "liststkaddon")
{ {
if (argv.size() != 2) if (argv.size() > 3)
{ {
NetworkingLobby::getInstance()->addMoreServerInfo( NetworkingLobby::getInstance()->addMoreServerInfo(
L"Usage: /liststkaddon [addon prefix letter(s) to find]"); L"Usage: /liststkaddon [option][addon prefix letter(s) to find]");
NetworkingLobby::getInstance()->addMoreServerInfo(
L"available options: -kart, -track, -arena.");
} }
else else
{ {
@ -1549,9 +1551,25 @@ void ClientLobby::handleClientCommand(const std::string& cmd)
// addon_ (6 letters) // addon_ (6 letters)
const Addon& addon = addons_manager->getAddon(i); const Addon& addon = addons_manager->getAddon(i);
const std::string& addon_id = addon.getId(); const std::string& addon_id = addon.getId();
if (addon.testStatus(Addon::AS_APPROVED) && if (addon.testStatus(Addon::AS_APPROVED))
addon_id.compare(6, argv[1].length(), argv[1]) == 0)
{ {
std::string type = "";
std::string text = "";
if(argv.size() > 1)
{
if(argv[1].compare("-track") == 0 ||
argv[1].compare("-arena") == 0 ||
argv[1].compare("-kart" ) == 0)
type = argv[1].substr(1);
if((argv.size() == 2 && type.empty()) || argv.size() == 3)
text = argv[argv.size()-1];
}
if(!type.empty() && addon.getType()!=type)
continue; // only show given type
if(!text.empty() && addon_id.find(text, 6) == std::string::npos)
continue; // only show matched
msg += addon_id.substr(6); msg += addon_id.substr(6);
msg += ", "; msg += ", ";
} }
@ -1569,49 +1587,76 @@ void ClientLobby::handleClientCommand(const std::string& cmd)
} }
else if (argv[0] == "listlocaladdon") else if (argv[0] == "listlocaladdon")
{ {
if (argv.size() != 2) if (argv.size() > 3)
{ {
NetworkingLobby::getInstance()->addMoreServerInfo( NetworkingLobby::getInstance()->addMoreServerInfo(
L"Usage: /listlocaladdon [addon prefix letter(s) to find]"); L"Usage: /listlocaladdon [option][addon prefix letter(s) to find]");
NetworkingLobby::getInstance()->addMoreServerInfo(
L"available options: -kart, -track/-arena, -skin.");
} }
else else
{ {
std::string type = "";
std::string text = "";
if(argv.size() > 1)
{
if(argv[1].compare("-track") == 0 ||
argv[1].compare("-arena") == 0 ||
argv[1].compare("-kart" ) == 0 ||
argv[1].compare("-skin" ) == 0)
type = argv[1].substr(1);
if((argv.size() == 2 && type.empty()) || argv.size() == 3)
text = argv[argv.size()-1];
}
std::set<std::string> total_addons; std::set<std::string> total_addons;
for (unsigned i = 0; if(type.empty() || // not specify addon type
i < kart_properties_manager->getNumberOfKarts(); i++) (!type.empty() && type.compare("kart") == 0)) // list kart addon
{ {
const KartProperties* kp = for (unsigned i = 0;
kart_properties_manager->getKartById(i); i < kart_properties_manager->getNumberOfKarts(); i++)
if (kp->isAddon()) {
total_addons.insert(kp->getIdent()); const KartProperties* kp =
kart_properties_manager->getKartById(i);
if (kp->isAddon())
total_addons.insert(kp->getIdent());
}
} }
for (unsigned i = 0; i < track_manager->getNumberOfTracks(); i++) if(type.empty() || // not specify addon type
(!type.empty() && (type.compare("track") == 0 || type.compare("arena") == 0)))
{ {
const Track* track = track_manager->getTrack(i); for (unsigned i = 0; i < track_manager->getNumberOfTracks(); i++)
if (track->isAddon()) {
total_addons.insert(track->getIdent()); const Track* track = track_manager->getTrack(i);
if (track->isAddon())
total_addons.insert(track->getIdent());
}
} }
std::set<std::string> addon_skin_files; if(type.empty() || // not specify addon type
std::string skin_folder = file_manager->getAddonsFile("skins/"); (!type.empty() && type.compare("skin") == 0))
file_manager->listFiles(addon_skin_files/*out*/, skin_folder,
false/*make full path*/);
for (auto& skin : addon_skin_files)
{ {
if (skin == "." || skin == "..") std::set<std::string> addon_skin_files;
continue; std::string skin_folder = file_manager->getAddonsFile("skins/");
std::string stkskin = skin_folder + skin + "/stkskin.xml"; file_manager->listFiles(addon_skin_files/*out*/, skin_folder,
if (file_manager->fileExists(stkskin)) false/*make full path*/);
total_addons.insert(Addon::createAddonId(skin)); for (auto& skin : addon_skin_files)
{
if (skin == "." || skin == "..")
continue;
std::string stkskin = skin_folder + skin + "/stkskin.xml";
if (file_manager->fileExists(stkskin))
total_addons.insert(Addon::createAddonId(skin));
}
} }
std::string msg = ""; std::string msg = "";
for (auto& addon : total_addons) for (auto& addon : total_addons)
{ {
// addon_ (6 letters) // addon_ (6 letters)
if (addon.compare(6, argv[1].length(), argv[1]) == 0) if (!text.empty() && addon.find(text, 6) == std::string::npos)
{ continue;
msg += addon.substr(6);
msg += ", "; msg += addon.substr(6);
} msg += ", ";
} }
if (msg.empty()) if (msg.empty())
NetworkingLobby::getInstance()->addMoreServerInfo(L"Addon not found"); NetworkingLobby::getInstance()->addMoreServerInfo(L"Addon not found");

51
src/network/protocols/server_lobby.cpp
View File

@ -4994,27 +4994,56 @@ void ServerLobby::handleServerCommand(Event* event,
NetworkString* chat = getNetworkString(); NetworkString* chat = getNetworkString();
chat->addUInt8(LE_CHAT); chat->addUInt8(LE_CHAT);
chat->setSynchronous(true); chat->setSynchronous(true);
if (argv.size() != 2) if (argv.size() > 3)
{ {
chat->encodeString16( chat->encodeString16(
L"Usage: /listserveraddon [addon prefix letter(s) to find]"); L"Usage: /listserveraddon [option][addon prefix letter(s) to find]. Available options: -track, -arena, -kart, -soccer.");
} }
else else
{ {
std::string type = "";
std::string text = "";
if(argv.size() > 1)
{
if(argv[1].compare("-track") == 0 ||
argv[1].compare("-arena") == 0 ||
argv[1].compare("-kart" ) == 0 ||
argv[1].compare("-soccer" ) == 0)
type = argv[1].substr(1);
if((argv.size() == 2 && type.empty()) || argv.size() == 3)
text = argv[argv.size()-1];
}
std::set<std::string> total_addons; std::set<std::string> total_addons;
total_addons.insert(m_addon_kts.first.begin(), m_addon_kts.first.end()); if(type.empty() || // not specify addon type
total_addons.insert(m_addon_kts.second.begin(), m_addon_kts.second.end()); (!type.empty() && type.compare("kart") == 0)) // list kart addon
total_addons.insert(m_addon_arenas.begin(), m_addon_arenas.end()); {
total_addons.insert(m_addon_soccers.begin(), m_addon_soccers.end()); total_addons.insert(m_addon_kts.first.begin(), m_addon_kts.first.end());
}
if(type.empty() || // not specify addon type
(!type.empty() && type.compare("track") == 0))
{
total_addons.insert(m_addon_kts.second.begin(), m_addon_kts.second.end());
}
if(type.empty() || // not specify addon type
(!type.empty() && type.compare("arena") == 0))
{
total_addons.insert(m_addon_arenas.begin(), m_addon_arenas.end());
}
if(type.empty() || // not specify addon type
(!type.empty() && type.compare("soccer") == 0))
{
total_addons.insert(m_addon_soccers.begin(), m_addon_soccers.end());
}
std::string msg = ""; std::string msg = "";
for (auto& addon : total_addons) for (auto& addon : total_addons)
{ {
// addon_ (6 letters) // addon_ (6 letters)
if (addon.compare(6, argv[1].length(), argv[1]) == 0) if (!text.empty() && addon.find(text, 6) == std::string::npos)
{ continue;
msg += addon.substr(6);
msg += ", "; msg += addon.substr(6);
} msg += ", ";
} }
if (msg.empty()) if (msg.empty())
chat->encodeString16(L"Addon not found"); chat->encodeString16(L"Addon not found");