RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 09:57:35 +00:00
Code Issues Activity Actions

AK+Userland: Return String from human_readable_[digital_]time()

Browse source
This commit is contained in:
Sam Atkins 2024-01-24 11:49:55 +00:00 • committed by Andreas Kling
parent b12541b286
commit 7e8cfb60eb
4 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
AK/NumberFormat.cpp
View file

@ -5,10 +5,8 @@
*/
#include <AK/Assertions.h>
#include <AK/ByteString.h>
#include <AK/NumberFormat.h>
#include <AK/NumericLimits.h>
#include <AK/StringView.h>
namespace AK {
@ -75,7 +73,7 @@ ByteString human_readable_size_long(u64 size, UseThousandsSeparator use_thousand
return ByteString::formatted("{} ({} bytes)", human_readable_size_string, size);
}
ByteString human_readable_time(i64 time_in_seconds)
String human_readable_time(i64 time_in_seconds)
{
auto days = time_in_seconds / 86400;
time_in_seconds = time_in_seconds % 86400;
@ -99,10 +97,10 @@ ByteString human_readable_time(i64 time_in_seconds)
builder.appendff("{} second{}", time_in_seconds, time_in_seconds == 1 ? "" : "s");
return builder.to_byte_string();
return MUST(builder.to_string());
}
ByteString human_readable_digital_time(i64 time_in_seconds)
String human_readable_digital_time(i64 time_in_seconds)
{
auto hours = time_in_seconds / 3600;
time_in_seconds = time_in_seconds % 3600;
@ -117,7 +115,7 @@ ByteString human_readable_digital_time(i64 time_in_seconds)
builder.appendff("{:02}:", minutes);
builder.appendff("{:02}", time_in_seconds);
return builder.to_byte_string();
return MUST(builder.to_string());
}
}

6
AK/NumberFormat.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <AK/ByteString.h>
#include <AK/String.h>
namespace AK {
@ -24,8 +24,8 @@ ByteString human_readable_size(u64 size, HumanReadableBasedOn based_on = HumanRe
ByteString human_readable_quantity(u64 quantity, HumanReadableBasedOn based_on = HumanReadableBasedOn::Base2, StringView unit = "B"sv, UseThousandsSeparator use_thousands_separator = UseThousandsSeparator::No);
ByteString human_readable_size_long(u64 size, UseThousandsSeparator use_thousands_separator = UseThousandsSeparator::No);
ByteString human_readable_time(i64 time_in_seconds);
ByteString human_readable_digital_time(i64 time_in_seconds);
String human_readable_time(i64 time_in_seconds);
String human_readable_digital_time(i64 time_in_seconds);
}