RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:17:34 +00:00
Code Issues Activity Actions

SystemMonitor: Replace uses of JsonObject::get_deprecated()/get_ptr()

Browse source
This commit is contained in:
Sam Atkins 2022-12-21 20:13:19 +00:00 • committed by Tim Flynn
parent 4b17cba074
commit 2df57d5ae0
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Userland/Applications/SystemMonitor/main.cpp
View file

@ -127,53 +127,53 @@ public:
df_fields.empend("source", "Source", Gfx::TextAlignment::CenterLeft); df_fields.empend("source", "Source", Gfx::TextAlignment::CenterLeft);
df_fields.empend( df_fields.empend(
"Size", Gfx::TextAlignment::CenterRight, "Size", Gfx::TextAlignment::CenterRight,
[](const JsonObject& object) { [](JsonObject const& object) {
StringBuilder size_builder; StringBuilder size_builder;
size_builder.append(' '); size_builder.append(' ');
size_builder.append(human_readable_size(object.get_deprecated("total_block_count"sv).to_u64() * object.get_deprecated("block_size"sv).to_u64())); size_builder.append(human_readable_size(object.get_u64("total_block_count"sv).value_or(0) * object.get_u64("block_size"sv).value_or(0)));
size_builder.append(' '); size_builder.append(' ');
return size_builder.to_deprecated_string(); return size_builder.to_deprecated_string();
}, },
[](const JsonObject& object) { [](JsonObject const& object) {
return object.get_deprecated("total_block_count"sv).to_u64() * object.get_deprecated("block_size"sv).to_u64(); return object.get_u64("total_block_count"sv).value_or(0) * object.get_u64("block_size"sv).value_or(0);
}, },
[](const JsonObject& object) { [](JsonObject const& object) {
auto total_blocks = object.get_deprecated("total_block_count"sv).to_u64(); auto total_blocks = object.get_u64("total_block_count"sv).value_or(0);
if (total_blocks == 0) if (total_blocks == 0)
return 0; return 0;
auto free_blocks = object.get_deprecated("free_block_count"sv).to_u64(); auto free_blocks = object.get_u64("free_block_count"sv).value_or(0);
auto used_blocks = total_blocks - free_blocks; auto used_blocks = total_blocks - free_blocks;
int percentage = (static_cast<double>(used_blocks) / static_cast<double>(total_blocks) * 100.0); int percentage = (static_cast<double>(used_blocks) / static_cast<double>(total_blocks) * 100.0);
return percentage; return percentage;
}); });
df_fields.empend( df_fields.empend(
"Used", Gfx::TextAlignment::CenterRight, "Used", Gfx::TextAlignment::CenterRight,
[](const JsonObject& object) { [](JsonObject const& object) {
auto total_blocks = object.get_deprecated("total_block_count"sv).to_u64(); auto total_blocks = object.get_u64("total_block_count"sv).value_or(0);
auto free_blocks = object.get_deprecated("free_block_count"sv).to_u64(); auto free_blocks = object.get_u64("free_block_count"sv).value_or(0);
auto used_blocks = total_blocks - free_blocks; auto used_blocks = total_blocks - free_blocks;
return human_readable_size(used_blocks * object.get_deprecated("block_size"sv).to_u64()); }, return human_readable_size(used_blocks * object.get_u64("block_size"sv).value_or(0)); },
[](const JsonObject& object) { [](JsonObject const& object) {
auto total_blocks = object.get_deprecated("total_block_count"sv).to_u64(); auto total_blocks = object.get_u64("total_block_count"sv).value_or(0);
auto free_blocks = object.get_deprecated("free_block_count"sv).to_u64(); auto free_blocks = object.get_u64("free_block_count"sv).value_or(0);
auto used_blocks = total_blocks - free_blocks; auto used_blocks = total_blocks - free_blocks;
return used_blocks * object.get_deprecated("block_size"sv).to_u64(); return used_blocks * object.get_u64("block_size"sv).value_or(0);
}); });
df_fields.empend( df_fields.empend(
"Available", Gfx::TextAlignment::CenterRight, "Available", Gfx::TextAlignment::CenterRight,
[](const JsonObject& object) { [](JsonObject const& object) {
return human_readable_size(object.get_deprecated("free_block_count"sv).to_u64() * object.get_deprecated("block_size"sv).to_u64()); return human_readable_size(object.get_u64("free_block_count"sv).value_or(0) * object.get_u64("block_size"sv).value_or(0));
}, },
[](const JsonObject& object) { [](JsonObject const& object) {
return object.get_deprecated("free_block_count"sv).to_u64() * object.get_deprecated("block_size"sv).to_u64(); return object.get_u64("free_block_count"sv).value_or(0) * object.get_u64("block_size"sv).value_or(0);
}); });
df_fields.empend("Access", Gfx::TextAlignment::CenterLeft, [](const JsonObject& object) { df_fields.empend("Access", Gfx::TextAlignment::CenterLeft, [](JsonObject const& object) {
bool readonly = object.get_deprecated("readonly"sv).to_bool(); bool readonly = object.get_bool("readonly"sv).value_or(false);
int mount_flags = object.get_deprecated("mount_flags"sv).to_int(); int mount_flags = object.get_i32("mount_flags"sv).value_or(0);
return readonly || (mount_flags & MS_RDONLY) ? "Read-only" : "Read/Write"; return readonly || (mount_flags & MS_RDONLY) ? "Read-only" : "Read/Write";
}); });
df_fields.empend("Mount flags", Gfx::TextAlignment::CenterLeft, [](const JsonObject& object) { df_fields.empend("Mount flags", Gfx::TextAlignment::CenterLeft, [](JsonObject const& object) {
int mount_flags = object.get_deprecated("mount_flags"sv).to_int(); int mount_flags = object.get_i32("mount_flags"sv).value_or(0);
StringBuilder builder; StringBuilder builder;
bool first = true; bool first = true;
auto check = [&](int flag, StringView name) { auto check = [&](int flag, StringView name) {