/*
- Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
This file is part of libdcp.
files in the program, then also delete it here.
*/
+
/** @file src/local_time.cc
- * @brief LocalTime class.
+ * @brief LocalTime class
*/
+
#include "local_time.h"
#include "exceptions.h"
#include "dcp_assert.h"
#include <boost/date_time/gregorian/gregorian.hpp>
#include <cstdio>
+
using std::string;
using std::ostream;
using boost::lexical_cast;
using namespace dcp;
-/** Construct a LocalTime from the current time */
+
LocalTime::LocalTime ()
{
- time_t now = time (0);
- struct tm* tm = localtime (&now);
+ auto now = time (0);
+ auto tm = localtime (&now);
set (tm);
set_local_time_zone ();
}
+
LocalTime::LocalTime (struct tm t)
{
set (&t);
set_local_time_zone ();
}
+
void
LocalTime::set (struct tm const * tm)
{
_millisecond = 0;
}
-/** Construct a LocalTime from a boost::posix_time::ptime using the local
- * time zone.
- */
+
LocalTime::LocalTime (boost::posix_time::ptime t)
{
set (t);
set_local_time_zone ();
}
+
void
LocalTime::set (boost::posix_time::ptime t)
{
DCP_ASSERT (_millisecond < 1000);
}
-/** Construct a LocalTime from a boost::posix_time::ptime and a time zone offset.
- * @param tz_minute Offset from UTC in minutes; if the timezone is behind UTC this may be negative,
- * e.g. -04:30 would have tz_hour=-1 and tz_minute=-30.
- */
-LocalTime::LocalTime (boost::posix_time::ptime t, int tz_hour, int tz_minute)
+
+LocalTime::LocalTime(boost::posix_time::ptime t, UTCOffset offset)
{
set (t);
- _tz_hour = tz_hour;
- _tz_minute = tz_minute;
+ _offset = offset;
}
+
/** Set our UTC offset to be according to the local time zone */
void
LocalTime::set_local_time_zone ()
{
- boost::posix_time::ptime const utc_now = boost::posix_time::second_clock::universal_time ();
- boost::posix_time::ptime const now = boost::date_time::c_local_adjustor<boost::posix_time::ptime>::utc_to_local (utc_now);
- boost::posix_time::time_duration offset = now - utc_now;
+ auto const utc_now = boost::posix_time::second_clock::universal_time ();
+ auto const now = boost::date_time::c_local_adjustor<boost::posix_time::ptime>::utc_to_local (utc_now);
+ auto offset = now - utc_now;
- _tz_hour = offset.hours ();
- _tz_minute = offset.minutes ();
+ _offset = { static_cast<int>(offset.hours()), static_cast<int>(offset.minutes()) };
}
-/** @param s A string of the form 2013-01-05T18:06:59[.123][+04:00] */
+
LocalTime::LocalTime (string s)
{
- /* 2013-01-05T18:06:59 or 2013-01-05T18:06:59.123 or 2013-01-05T18:06:59+04:00 or 2013-01-05T18:06:59.123+04:00 */
- /* 0123456789012345678 or 01234567890123456789012 or 0123456789012345678901234 or 01234567890123456789012345678 */
+ /* 2013-01-05T18:06:59[.frac][TZ]
+ * Where .frac is fractional seconds
+ * TZ is something like +04:00
+ */
if (s.length() < 19) {
throw TimeFormatError (s);
}
- bool with_millisecond = false;
- bool with_tz = false;
-
- switch (s.length ()) {
- case 19:
- break;
- case 23:
- with_millisecond = true;
- break;
- case 25:
- with_tz = true;
- break;
- case 29:
- with_millisecond = with_tz = true;
- break;
- default:
- throw TimeFormatError (s);
- }
-
- int const tz_pos = with_millisecond ? 23 : 19;
+ /* Date and time with whole seconds */
- /* Check incidental characters */
if (s[4] != '-' || s[7] != '-' || s[10] != 'T' || s[13] != ':' || s[16] != ':') {
- throw TimeFormatError (s);
+ throw TimeFormatError(s);
}
- if (with_millisecond && s[19] != '.') {
- throw TimeFormatError (s);
- }
- if (with_tz && s[tz_pos] != '+' && s[tz_pos] != '-') {
- throw TimeFormatError (s);
+
+ _year = lexical_cast<int>(s.substr(0, 4));
+ _month = lexical_cast<int>(s.substr(5, 2));
+ _day = lexical_cast<int>(s.substr(8, 2));
+ _hour = lexical_cast<int>(s.substr(11, 2));
+ _minute = lexical_cast<int>(s.substr(14, 2));
+ _second = lexical_cast<int>(s.substr(17, 2));
+
+ size_t pos = 19;
+
+ /* Fractional seconds */
+ if (s.length() > pos && s[pos] == '.') {
+ auto end = s.find('+', pos);
+ if (end == std::string::npos) {
+ end = s.find('-', pos);
+ }
+ if (end == std::string::npos) {
+ end = s.length();
+ }
+ auto const length = end - pos;
+ _millisecond = lexical_cast<int>(s.substr(pos + 1, std::min(static_cast<size_t>(3), length - 1)));
+ pos = end;
+ } else {
+ _millisecond = 0;
}
- _year = lexical_cast<int> (s.substr (0, 4));
- _month = lexical_cast<int> (s.substr (5, 2));
- _day = lexical_cast<int> (s.substr (8, 2));
- _hour = lexical_cast<int> (s.substr (11, 2));
- _minute = lexical_cast<int> (s.substr (14, 2));
- _second = lexical_cast<int> (s.substr (17, 2));
- _millisecond = with_millisecond ? lexical_cast<int> (s.substr (20, 3)) : 0;
- _tz_hour = with_tz ? lexical_cast<int> (s.substr (tz_pos + 1, 2)) : 0;
- _tz_minute = with_tz ? lexical_cast<int> (s.substr (tz_pos + 4, 2)) : 0;
-
- if (with_tz && s[tz_pos] == '-') {
- _tz_hour = -_tz_hour;
- _tz_minute = -_tz_minute;
+ /* Timezone */
+ if (pos != s.length() && s[pos] != 'Z') {
+ if (s[pos] != '+' && s[pos] != '-') {
+ throw TimeFormatError(s);
+ }
+ if ((s.length() - pos) != 6) {
+ throw TimeFormatError(s);
+ }
+
+ _offset.set_hour(lexical_cast<int>(s.substr(pos + 1, 2)));
+ _offset.set_minute(lexical_cast<int>(s.substr(pos + 4, 2)));
+
+ if (s[pos] == '-') {
+ _offset.set_hour(-_offset.hour());
+ _offset.set_minute(-_offset.minute());
+ }
}
}
-/** @return A string of the form 2013-01-05T18:06:59+04:00 or 2013-01-05T18:06:59.123+04:00 */
+
string
-LocalTime::as_string (bool with_millisecond) const
+LocalTime::as_string(bool with_millisecond, bool with_timezone) const
{
char buffer[32];
- snprintf (
+
+ auto const written = snprintf(
buffer, sizeof (buffer),
- "%sT%s%s%02d:%02d",
- date().c_str(), time_of_day(true, with_millisecond).c_str(), (_tz_hour >= 0 ? "+" : "-"), abs (_tz_hour), abs(_tz_minute)
+ "%sT%s",
+ date().c_str(), time_of_day(true, with_millisecond).c_str()
);
+
+ DCP_ASSERT(written < 32);
+
+ if (with_timezone) {
+ snprintf(
+ buffer + written, sizeof(buffer) - written,
+ "%s%02d:%02d", (_offset.hour() >= 0 ? "+" : "-"), abs(_offset.hour()), abs(_offset.minute())
+ );
+ }
return buffer;
}
-/** @return The date in the form YYYY-MM-DD */
+
string
LocalTime::date () const
{
return buffer;
}
-/** @return The time in the form HH:MM:SS or HH:MM:SS.mmm */
+
string
LocalTime::time_of_day (bool with_second, bool with_millisecond) const
{
}
+void
+LocalTime::add(boost::posix_time::time_duration duration)
+{
+ using namespace boost;
+
+ posix_time::ptime t(gregorian::date(_year, _month, _day), posix_time::time_duration(_hour, _minute, _second, _millisecond * 1000));
+ t += duration;
+ set (t);
+}
+
+
void
LocalTime::add_months (int m)
{
set (posix_time::ptime(d, posix_time::time_duration(_hour, _minute, _second, _millisecond * 1000)));
}
+
void
LocalTime::add_minutes (int m)
{
- using namespace boost;
-
- posix_time::ptime t(gregorian::date(_year, _month, _day), posix_time::time_duration(_hour, _minute, _second, _millisecond * 1000));
- t += posix_time::time_duration(0, m, 0);
- set (t);
+ add(boost::posix_time::time_duration(0, m, 0));
}
+
bool
LocalTime::operator== (LocalTime const & other) const
{
- return _year == other._year && _month == other._month && _day == other._day &&
- _hour == other._hour && _second == other._second && _millisecond == other._millisecond &&
- _tz_hour == other._tz_hour && _tz_minute == other._tz_minute;
+ auto a = as_utc();
+ auto b = other.as_utc();
+
+ return a.year() == b.year() && a.month() == b.month() && a.day() == b.day() &&
+ a.hour() == b.hour() && a.minute() == b.minute() && a.second() == b.second() && a.millisecond() == b.millisecond();
}
+
bool
LocalTime::operator< (LocalTime const & other) const
{
- if (_year != other._year) {
- return _year < other._year;
+ auto a = as_utc();
+ auto b = other.as_utc();
+
+ if (a.year() != b.year()) {
+ return a.year() < b.year();
+ }
+ if (a.month() != b.month()) {
+ return a.month() < b.month();
}
- if (_month != other._month) {
- return _month < other._month;
+ if (a.day() != b.day()) {
+ return a.day() < b.day();
}
- if (_day != other._day) {
- return _day < other._day;
+ if (a.hour() != b.hour()) {
+ return a.hour() < b.hour();
}
- if (_hour != other._hour) {
- return _hour < other._hour;
+ if (a.minute() != b.minute()) {
+ return a.minute() < other.minute();
}
- if (_second != other._second) {
- return _second < other._second;
+ if (a.second() != b.second()) {
+ return a.second() < b.second();
}
- return _millisecond < other._millisecond;
+ return a.millisecond() < b.millisecond();
+}
+
+
+bool
+LocalTime::operator<=(LocalTime const& other) const
+{
+ return *this < other || *this == other;
+}
+
+
+
+bool
+LocalTime::operator>(LocalTime const & other) const
+{
+ auto a = as_utc();
+ auto b = other.as_utc();
+
+ if (a.year() != b.year()) {
+ return a.year() > b.year();
+ }
+ if (a.month() != b.month()) {
+ return a.month() > b.month();
+ }
+ if (a.day() != b.day()) {
+ return a.day() > b.day();
+ }
+ if (a.hour() != b.hour()) {
+ return a.hour() > b.hour();
+ }
+ if (a.minute() != b.minute()) {
+ return a.minute() > b.minute();
+ }
+ if (a.second() != b.second()) {
+ return a.second() > b.second();
+ }
+ return a.millisecond() > b.millisecond();
+}
+
+
+bool
+LocalTime::operator>=(LocalTime const& other) const
+{
+ return *this > other || *this == other;
}
+
bool
LocalTime::operator!= (LocalTime const & other) const
{
return !(*this == other);
}
+
ostream&
dcp::operator<< (ostream& s, LocalTime const & t)
{
s << t.as_string ();
return s;
}
+
+
+LocalTime
+LocalTime::from_asn1_utc_time (string time)
+{
+ LocalTime t;
+ sscanf(time.c_str(), "%2d%2d%2d%2d%2d%2d", &t._year, &t._month, &t._day, &t._hour, &t._minute, &t._second);
+
+ if (t._year < 70) {
+ t._year += 100;
+ }
+ t._year += 1900;
+
+ t._millisecond = 0;
+ t._offset = {};
+
+ return t;
+}
+
+
+LocalTime
+LocalTime::from_asn1_generalized_time (string time)
+{
+ LocalTime t;
+ sscanf(time.c_str(), "%4d%2d%2d%2d%2d%2d", &t._year, &t._month, &t._day, &t._hour, &t._minute, &t._second);
+
+ t._millisecond = 0;
+ t._offset = {};
+
+ return t;
+}
+
+
+LocalTime
+LocalTime::as_utc() const
+{
+ auto t = *this;
+ t.add(boost::posix_time::time_duration(-_offset.hour(), -_offset.minute(), 0));
+ return t;
+}
+
projects / libdcp.git / blobdiff