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

LibCore: Add DateTime::to_string()

Browse source 
This is just the contents of to_deprecated_string() with errors
propagated. to_deprecated_string() is now implemented using to_string().
This commit is contained in:
Sam Atkins 2023-03-27 16:35:24 +01:00 • committed by Sam Atkins
parent 7dfe1f9f8f
commit 8dd0038f47
2 changed files with 52 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

95
Userland/Libraries/LibCore/DateTime.cpp
View file

@ -6,6 +6,7 @@
#include <AK/CharacterTypes.h> #include <AK/CharacterTypes.h>
#include <AK/DateConstants.h> #include <AK/DateConstants.h>
#include <AK/String.h>
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <AK/Time.h> #include <AK/Time.h>
#include <LibCore/DateTime.h> #include <LibCore/DateTime.h>
@ -84,14 +85,14 @@ void DateTime::set_time(int year, int month, int day, int hour, int minute, int
m_second = tm.tm_sec; m_second = tm.tm_sec;
} }
DeprecatedString DateTime::to_deprecated_string(StringView format) const ErrorOr<String> DateTime::to_string(StringView format) const
{ {
struct tm tm; struct tm tm;
localtime_r(&m_timestamp, &tm); localtime_r(&m_timestamp, &tm);
StringBuilder builder; StringBuilder builder;
int const format_len = format.length(); int const format_len = format.length();
auto format_time_zone_offset = [&](bool with_separator) { auto format_time_zone_offset = [&](bool with_separator) -> ErrorOr<void> {
struct tm gmt_tm; struct tm gmt_tm;
gmtime_r(&m_timestamp, &gmt_tm); gmtime_r(&m_timestamp, &gmt_tm);
@ -112,102 +113,103 @@ DeprecatedString DateTime::to_deprecated_string(StringView format) const
auto offset_minutes = (offset_seconds % 3600) / 60; auto offset_minutes = (offset_seconds % 3600) / 60;
auto separator = with_separator ? ":"sv : ""sv; auto separator = with_separator ? ":"sv : ""sv;
builder.appendff("{}{:02}{}{:02}", offset_sign, offset_hours, separator, offset_minutes); TRY(builder.try_appendff("{}{:02}{}{:02}", offset_sign, offset_hours, separator, offset_minutes));
return {};
}; };
for (int i = 0; i < format_len; ++i) { for (int i = 0; i < format_len; ++i) {
if (format[i] != '%') { if (format[i] != '%') {
builder.append(format[i]); TRY(builder.try_append(format[i]));
} else { } else {
if (++i == format_len) if (++i == format_len)
return DeprecatedString(); return String {};
switch (format[i]) { switch (format[i]) {
case 'a': case 'a':
builder.append(short_day_names[tm.tm_wday]); TRY(builder.try_append(short_day_names[tm.tm_wday]));
break; break;
case 'A': case 'A':
builder.append(long_day_names[tm.tm_wday]); TRY(builder.try_append(long_day_names[tm.tm_wday]));
break; break;
case 'b': case 'b':
builder.append(short_month_names[tm.tm_mon]); TRY(builder.try_append(short_month_names[tm.tm_mon]));
break; break;
case 'B': case 'B':
builder.append(long_month_names[tm.tm_mon]); TRY(builder.try_append(long_month_names[tm.tm_mon]));
break; break;
case 'C': case 'C':
builder.appendff("{:02}", (tm.tm_year + 1900) / 100); TRY(builder.try_appendff("{:02}", (tm.tm_year + 1900) / 100));
break; break;
case 'd': case 'd':
builder.appendff("{:02}", tm.tm_mday); TRY(builder.try_appendff("{:02}", tm.tm_mday));
break; break;
case 'D': case 'D':
builder.appendff("{:02}/{:02}/{:02}", tm.tm_mon + 1, tm.tm_mday, (tm.tm_year + 1900) % 100); TRY(builder.try_appendff("{:02}/{:02}/{:02}", tm.tm_mon + 1, tm.tm_mday, (tm.tm_year + 1900) % 100));
break; break;
case 'e': case 'e':
builder.appendff("{:2}", tm.tm_mday); TRY(builder.try_appendff("{:2}", tm.tm_mday));
break; break;
case 'h': case 'h':
builder.append(short_month_names[tm.tm_mon]); TRY(builder.try_append(short_month_names[tm.tm_mon]));
break; break;
case 'H': case 'H':
builder.appendff("{:02}", tm.tm_hour); TRY(builder.try_appendff("{:02}", tm.tm_hour));
break; break;
case 'I': { case 'I': {
int display_hour = tm.tm_hour % 12; int display_hour = tm.tm_hour % 12;
if (display_hour == 0) if (display_hour == 0)
display_hour = 12; display_hour = 12;
builder.appendff("{:02}", display_hour); TRY(builder.try_appendff("{:02}", display_hour));
break; break;
} }
case 'j': case 'j':
builder.appendff("{:03}", tm.tm_yday + 1); TRY(builder.try_appendff("{:03}", tm.tm_yday + 1));
break; break;
case 'l': { case 'l': {
int display_hour = tm.tm_hour % 12; int display_hour = tm.tm_hour % 12;
if (display_hour == 0) if (display_hour == 0)
display_hour = 12; display_hour = 12;
builder.appendff("{:2}", display_hour); TRY(builder.try_appendff("{:2}", display_hour));
break; break;
} }
case 'm': case 'm':
builder.appendff("{:02}", tm.tm_mon + 1); TRY(builder.try_appendff("{:02}", tm.tm_mon + 1));
break; break;
case 'M': case 'M':
builder.appendff("{:02}", tm.tm_min); TRY(builder.try_appendff("{:02}", tm.tm_min));
break; break;
case 'n': case 'n':
builder.append('\n'); TRY(builder.try_append('\n'));
break; break;
case 'p': case 'p':
builder.append(tm.tm_hour < 12 ? "AM"sv : "PM"sv); TRY(builder.try_append(tm.tm_hour < 12 ? "AM"sv : "PM"sv));
break; break;
case 'r': { case 'r': {
int display_hour = tm.tm_hour % 12; int display_hour = tm.tm_hour % 12;
if (display_hour == 0) if (display_hour == 0)
display_hour = 12; display_hour = 12;
builder.appendff("{:02}:{:02}:{:02} {}", display_hour, tm.tm_min, tm.tm_sec, tm.tm_hour < 12 ? "AM" : "PM"); TRY(builder.try_appendff("{:02}:{:02}:{:02} {}", display_hour, tm.tm_min, tm.tm_sec, tm.tm_hour < 12 ? "AM" : "PM"));
break; break;
} }
case 'R': case 'R':
builder.appendff("{:02}:{:02}", tm.tm_hour, tm.tm_min); TRY(builder.try_appendff("{:02}:{:02}", tm.tm_hour, tm.tm_min));
break; break;
case 'S': case 'S':
builder.appendff("{:02}", tm.tm_sec); TRY(builder.try_appendff("{:02}", tm.tm_sec));
break; break;
case 't': case 't':
builder.append('\t'); TRY(builder.try_append('\t'));
break; break;
case 'T': case 'T':
builder.appendff("{:02}:{:02}:{:02}", tm.tm_hour, tm.tm_min, tm.tm_sec); TRY(builder.try_appendff("{:02}:{:02}:{:02}", tm.tm_hour, tm.tm_min, tm.tm_sec));
break; break;
case 'u': case 'u':
builder.appendff("{}", tm.tm_wday ? tm.tm_wday : 7); TRY(builder.try_appendff("{}", tm.tm_wday ? tm.tm_wday : 7));
break; break;
case 'U': { case 'U': {
int const wday_of_year_beginning = (tm.tm_wday + 6 * tm.tm_yday) % 7; int const wday_of_year_beginning = (tm.tm_wday + 6 * tm.tm_yday) % 7;
int const week_number = (tm.tm_yday + wday_of_year_beginning) / 7; int const week_number = (tm.tm_yday + wday_of_year_beginning) / 7;
builder.appendff("{:02}", week_number); TRY(builder.try_appendff("{:02}", week_number));
break; break;
} }
case 'V': { case 'V': {
@ -224,56 +226,61 @@ DeprecatedString DateTime::to_deprecated_string(StringView format) const
--week_number; --week_number;
} }
} }
builder.appendff("{:02}", week_number); TRY(builder.try_appendff("{:02}", week_number));
break; break;
} }
case 'w': case 'w':
builder.appendff("{}", tm.tm_wday); TRY(builder.try_appendff("{}", tm.tm_wday));
break; break;
case 'W': { case 'W': {
int const wday_of_year_beginning = (tm.tm_wday + 6 + 6 * tm.tm_yday) % 7; int const wday_of_year_beginning = (tm.tm_wday + 6 + 6 * tm.tm_yday) % 7;
int const week_number = (tm.tm_yday + wday_of_year_beginning) / 7; int const week_number = (tm.tm_yday + wday_of_year_beginning) / 7;
builder.appendff("{:02}", week_number); TRY(builder.try_appendff("{:02}", week_number));
break; break;
} }
case 'y': case 'y':
builder.appendff("{:02}", (tm.tm_year + 1900) % 100); TRY(builder.try_appendff("{:02}", (tm.tm_year + 1900) % 100));
break; break;
case 'Y': case 'Y':
builder.appendff("{}", tm.tm_year + 1900); TRY(builder.try_appendff("{}", tm.tm_year + 1900));
break; break;
case 'z': case 'z':
format_time_zone_offset(false); TRY(format_time_zone_offset(false));
break; break;
case ':': case ':':
if (++i == format_len) { if (++i == format_len) {
builder.append("%:"sv); TRY(builder.try_append("%:"sv));
break; break;
} }
if (format[i] != 'z') { if (format[i] != 'z') {
builder.append("%:"sv); TRY(builder.try_append("%:"sv));
builder.append(format[i]); TRY(builder.try_append(format[i]));
break; break;
} }
format_time_zone_offset(true); TRY(format_time_zone_offset(true));
break; break;
case 'Z': { case 'Z': {
auto const* timezone_name = tzname[tm.tm_isdst == 0 ? 0 : 1]; auto const* timezone_name = tzname[tm.tm_isdst == 0 ? 0 : 1];
builder.append({ timezone_name, strlen(timezone_name) }); TRY(builder.try_append({ timezone_name, strlen(timezone_name) }));
break; break;
} }
case '%': case '%':
builder.append('%'); TRY(builder.try_append('%'));
break; break;
default: default:
builder.append('%'); TRY(builder.try_append('%'));
builder.append(format[i]); TRY(builder.try_append(format[i]));
break; break;
} }
} }
} }
return builder.to_deprecated_string(); return builder.to_string();
}
DeprecatedString DateTime::to_deprecated_string(StringView format) const
{
return MUST(to_string(format)).to_deprecated_string();
} }
Optional<DateTime> DateTime::parse(StringView format, DeprecatedString const& string) Optional<DateTime> DateTime::parse(StringView format, DeprecatedString const& string)

1
Userland/Libraries/LibCore/DateTime.h
View file

@ -31,6 +31,7 @@ public:
bool is_leap_year() const; bool is_leap_year() const;
void set_time(int year, int month = 1, int day = 1, int hour = 0, int minute = 0, int second = 0); void set_time(int year, int month = 1, int day = 1, int hour = 0, int minute = 0, int second = 0);
ErrorOr<String> to_string(StringView format = "%Y-%m-%d %H:%M:%S"sv) const;
DeprecatedString to_deprecated_string(StringView format = "%Y-%m-%d %H:%M:%S"sv) const; DeprecatedString to_deprecated_string(StringView format = "%Y-%m-%d %H:%M:%S"sv) const;
static DateTime create(int year, int month = 1, int day = 1, int hour = 0, int minute = 0, int second = 0); static DateTime create(int year, int month = 1, int day = 1, int hour = 0, int minute = 0, int second = 0);