From b8cf83926a98bcaa8664aa3eecec9e9ec61a72c1 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 11 Feb 2020 19:42:02 +0100 Subject: [PATCH] LibCore: Add a basic Core::DateTime class This is just to have a pleasant way to print the current time for now: dbg() << Core::DateTime::now(); Or if you want it as a string: Core::DateTime::now().to_string(); --- Libraries/LibCore/DateTime.cpp | 54 ++++++++++++++++++++++++++++ Libraries/LibCore/DateTime.h | 65 ++++++++++++++++++++++++++++++++++ Libraries/LibCore/Makefile | 1 + 3 files changed, 120 insertions(+) create mode 100644 Libraries/LibCore/DateTime.cpp create mode 100644 Libraries/LibCore/DateTime.h diff --git a/Libraries/LibCore/DateTime.cpp b/Libraries/LibCore/DateTime.cpp new file mode 100644 index 0000000000..11d9ae0b8d --- /dev/null +++ b/Libraries/LibCore/DateTime.cpp @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2020, Andreas Kling + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include + +namespace Core { + +DateTime DateTime::now() +{ + auto timestamp = time(nullptr); + struct tm tm; + localtime_r(×tamp, &tm); + DateTime dt; + dt.m_year = tm.tm_year + 1900; + dt.m_month = tm.tm_mon + 1; + dt.m_day = tm.tm_mday; + dt.m_hour = tm.tm_hour; + dt.m_minute = tm.tm_min; + dt.m_second = tm.tm_sec; + dt.m_timestamp = timestamp; + return dt; +} + +String DateTime::to_string() const +{ + return String::format("%04u-%02u-%02u %02u:%02u:%02u", m_year, m_month, m_day, m_hour, m_minute, m_day); +} + +} diff --git a/Libraries/LibCore/DateTime.h b/Libraries/LibCore/DateTime.h new file mode 100644 index 0000000000..2fac9b6228 --- /dev/null +++ b/Libraries/LibCore/DateTime.h @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2018-2020, Andreas Kling + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#pragma once + +#include +#include + +namespace Core { + +class DateTime { +public: + time_t timestamp() const { return m_timestamp; } + + unsigned year() const { return m_year; } + unsigned month() const { return m_month; } + unsigned day() const { return m_day; } + + unsigned hour() const { return m_hour; } + unsigned minute() const { return m_minute; } + unsigned second() const { return m_second; } + + String to_string() const; + + static DateTime now(); + +private: + time_t m_timestamp { 0 }; + unsigned m_year { 0 }; + unsigned m_month { 0 }; + unsigned m_day { 0 }; + unsigned m_hour { 0 }; + unsigned m_minute { 0 }; + unsigned m_second { 0 }; +}; + +inline const LogStream& operator<<(const LogStream& stream, const DateTime& value) +{ + return stream << value.to_string(); +} + +} diff --git a/Libraries/LibCore/Makefile b/Libraries/LibCore/Makefile index 2c57812c70..b2b47d06c5 100644 --- a/Libraries/LibCore/Makefile +++ b/Libraries/LibCore/Makefile @@ -1,5 +1,6 @@ OBJS = \ ArgsParser.o \ + DateTime.o \ IODevice.o \ File.o \ Socket.o \