Macintosh-HW
/
RASCSI
mirror of https://github.com/akuker/RASCSI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Sort map by operation name

This commit is contained in:
Uwe Seimet 2021-12-18 14:17:50 +01:00
parent b64001e8a4
commit c88628e12a
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/raspberrypi/rasctl_display.cpp
View File

@ -276,13 +276,26 @@ void RasctlDisplay::DisplayMappingInfo(const PbMappingInfo& mapping_info)
void RasctlDisplay::DisplayOperationInfo(const PbOperationInfo& operation_info)
{
// Creates a sorted map
const map<int, PbOperationMetaData> operations = { operation_info.operations().begin(), operation_info.operations().end() };
// Copies result into a map sorted by operation name
PbOperationMetaData *empty_operation = new PbOperationMetaData();
map<string, PbOperationMetaData> sorted_operations;
auto iter = operations.begin();
while (iter != operations.end()) {
if (PbOperation_IsValid(static_cast<PbOperation>(iter->first))) {
sorted_operations[PbOperation_Name(static_cast<PbOperation>(iter->first))] = iter->second;
}
else {
sorted_operations[iter->second.name()] = *empty_operation;
}
iter++;
}
cout << "Remote operations supported by rascsi and their parameters:" << endl;
for (const auto& operation : operations) {
if (PbOperation_IsValid(static_cast<PbOperation>(operation.first))) {
cout << " " << PbOperation_Name(static_cast<PbOperation>(operation.first));
for (const auto& operation : sorted_operations) {
if (!operation.second.name().empty()) {
cout << " " << operation.first;
if (!operation.second.description().empty()) {
cout << " (" << operation.second.description().at("en") << ")";
}
@ -315,7 +328,7 @@ void RasctlDisplay::DisplayOperationInfo(const PbOperationInfo& operation_info)
}
}
else {
cout << " " << operation.second.name() << " (Unknown server-side operation)" << endl;
cout << " " << operation.first << " (Unknown server-side operation)" << endl;
}
}
}