pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 07:21:48 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Commands] Cleanup #serverinfo Command. (#2568)

Browse Source 
- Cleanup messages.
- Use new dialogue window methods.
This commit is contained in:
Kinglykrab 2022-11-22 09:14:22 -05:00 committed by GitHub
parent f143d0a75f
commit 9f65159cb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 77 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
zone/gm_commands/serverinfo.cpp
View File

@ -1,4 +1,5 @@
#include "../client.h" #include "../client.h"
#include "../dialogue_window.h"
#include "../../common/serverinfo.h" #include "../../common/serverinfo.h"
void command_serverinfo(Client *c, const Seperator *sep) void command_serverinfo(Client *c, const Seperator *sep)
@ -9,86 +10,113 @@ void command_serverinfo(Client *c, const Seperator *sep)
auto rss = EQ::GetRSS() / 1048576.0; auto rss = EQ::GetRSS() / 1048576.0;
auto uptime = static_cast<uint32>(EQ::GetUptime()); auto uptime = static_cast<uint32>(EQ::GetUptime());
std::string popup_text; std::string popup_table;
auto popup_text = DialogueWindow::CenterMessage(
DialogueWindow::ColorMessage("green", "Operating System Information")
);
popup_text.append("<c \"#00FF00\">Operating System Information</c>"); popup_table.append(
DialogueWindow::TableRow(
popup_text.append("<table>"); DialogueWindow::TableCell("Machine") +
DialogueWindow::TableCell(os.machine)
popup_text.append(
fmt::format(
"<tr><td>System</td><td>{}</td></tr>",
os.sysname
).c_str() ).c_str()
); );
popup_text.append( popup_table.append(
fmt::format( DialogueWindow::TableRow(
"<tr><td>Release</td><td>{}</td></tr>", DialogueWindow::TableCell("System") +
os.release DialogueWindow::TableCell(os.sysname)
) ).c_str()
); );
popup_text.append( popup_table.append(
fmt::format( DialogueWindow::TableRow(
"<tr><td>Version</td><td>{}</td></tr>", DialogueWindow::TableCell("Release") +
os.version DialogueWindow::TableCell(os.release)
) ).c_str()
); );
popup_text.append( popup_table.append(
fmt::format( DialogueWindow::TableRow(
"<tr><td>Machine</td><td>{}</td></tr>", DialogueWindow::TableCell("Uptime") +
os.machine DialogueWindow::TableCell(Strings::SecondsToTime(uptime))
) ).c_str()
); );
popup_text.append( popup_table.append(
fmt::format( DialogueWindow::TableRow(
"<tr><td>Uptime</td><td>{}</td></tr>", DialogueWindow::TableCell("Version") +
Strings::SecondsToTime(uptime) DialogueWindow::TableCell(os.version)
) ).c_str()
); );
popup_text.append("</table>"); popup_text.append(DialogueWindow::Table(popup_table));
popup_text.append("<c \"#00FF00\">CPU Information</c>"); popup_table = std::string();
popup_text.append("<table>"); popup_text.append(DialogueWindow::Break());
popup_text.append(
DialogueWindow::CenterMessage(
DialogueWindow::ColorMessage("green", "CPU Information")
)
);
for (size_t cpu = 0; cpu < cpus.size(); ++cpu) { for (size_t cpu = 0; cpu < cpus.size(); ++cpu) {
auto &current_cpu = cpus[cpu]; auto &current_cpu = cpus[cpu];
popup_text.append( popup_table.append(
fmt::format( DialogueWindow::TableRow(
"<tr><td>CPU {}</td><td>{} ({:.2f}GHz)</td></tr>", DialogueWindow::TableCell(
cpu, fmt::format(
current_cpu.model, "CPU {}",
current_cpu.speed cpu
)
) +
DialogueWindow::TableCell(
fmt::format(
"{} ({:.2f}GHz)",
current_cpu.model,
current_cpu.speed
)
)
) )
); );
} }
popup_text.append("</table>"); popup_text.append(DialogueWindow::Table(popup_table));
popup_text.append("<c \"#00FF00\">Process Information</c>"); popup_table = std::string();
popup_text.append(DialogueWindow::Break());
popup_text.append(
DialogueWindow::CenterMessage(
DialogueWindow::ColorMessage("green", "CPU Information")
)
);
popup_text.append("<table>"); popup_text.append("<table>");
popup_text.append( popup_table.append(
fmt::format( DialogueWindow::TableRow(
"<tr><td>Process ID</td><td>{}</td></tr>", DialogueWindow::TableCell("Process ID") +
process_id DialogueWindow::TableCell(std::to_string(process_id))
) )
); );
popup_text.append( popup_table.append(
fmt::format( DialogueWindow::TableRow(
"<tr><td>RSS</td><td>{:.2f} MB</td></tr>", DialogueWindow::TableCell("RSS") +
rss DialogueWindow::TableCell(
fmt::format(
"{:.2f} MB",
rss
)
)
) )
); );
popup_text.append("</table>"); popup_text.append(DialogueWindow::Table(popup_table));
c->SendPopupToClient( c->SendPopupToClient(
"Server Information", "Server Information",