Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-12-23 06:30:04 +00:00
Code Issues Projects Releases Wiki Activity

Sort devices list by ID *and unit*

Browse Source
This commit is contained in:
Uwe Seimet 2021-08-29 16:18:25 +02:00
parent 665ad92b2c
commit 5ed6673429
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/raspberrypi/rascsi.cpp
View File

@ -593,11 +593,10 @@ void GetDeviceTypeFeatures(PbServerInfo& serverInfo)
void GetAvailableImages(PbServerInfo& serverInfo) void GetAvailableImages(PbServerInfo& serverInfo)
{ {
if (access(default_image_folder.c_str(), F_OK) != -1) { if (!access(default_image_folder.c_str(), F_OK)) {
for (const auto& entry : filesystem::directory_iterator(default_image_folder)) { for (const auto& entry : filesystem::directory_iterator(default_image_folder)) {
if (entry.is_regular_file()) { if (entry.is_regular_file()) {
PbImageFile *image_file = serverInfo.add_image_files(); GetImageFile(serverInfo.add_image_files(), entry.path().filename());
GetImageFile(image_file, entry.path().filename());
} }
} }
} }

4
src/raspberrypi/rasctl.cpp
View File

@ -202,7 +202,7 @@ void CommandServerInfo(const string& hostname, int port)
} }
else { else {
list<PbImageFile> files = { serverInfo.image_files().begin(), serverInfo.image_files().end() }; list<PbImageFile> files = { serverInfo.image_files().begin(), serverInfo.image_files().end() };
files.sort([](const PbImageFile& a, const PbImageFile& b) { return a.name() < b.name(); }); files.sort([](const auto& a, const auto& b) { return a.name() < b.name(); });
cout << "Available image files:" << endl; cout << "Available image files:" << endl;
for (const auto& file : files) { for (const auto& file : files) {
@ -293,7 +293,7 @@ void CommandServerInfo(const string& hostname, int port)
} }
else { else {
list<PbDevice> sorted_devices = { serverInfo.devices().devices().begin(), serverInfo.devices().devices().end() }; list<PbDevice> sorted_devices = { serverInfo.devices().devices().begin(), serverInfo.devices().devices().end() };
sorted_devices.sort([](const PbDevice& a, const PbDevice& b) { return a.id() < b.id(); }); sorted_devices.sort([](const auto& a, const auto& b) { return a.id() < b.id(); });
cout << "Attached devices:" << endl; cout << "Attached devices:" << endl;

7
src/raspberrypi/rasutil.cpp
View File

@ -33,11 +33,8 @@ string ListDevices(const PbDevices& devices)
return "No images currently attached."; return "No images currently attached.";
} }
list<PbDevice> sorted_devices; list<PbDevice> sorted_devices = { devices.devices().begin(), devices.devices().end() };
for (int i = 0; i < devices.devices_size(); i++) { sorted_devices.sort([](const PbDevice& a, const PbDevice& b) { return a.id() < b.id() && a.unit() < b.unit(); });
sorted_devices.push_back(devices.devices(i));
}
sorted_devices.sort([](const PbDevice& a, const PbDevice& b) { return a.id() < b.id(); });
for (const auto& device : sorted_devices) { for (const auto& device : sorted_devices) {
string filename; string filename;