/*
Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of libdcp.
+
+ libdcp is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ libdcp is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with libdcp. If not, see <http://www.gnu.org/licenses/>.
*/
#include "local_time.h"
#include "exceptions.h"
+#include "dcp_assert.h"
#include <boost/lexical_cast.hpp>
#include <boost/date_time/c_local_time_adjustor.hpp>
#include <cstdio>
using std::string;
+using std::ostream;
using boost::lexical_cast;
using namespace dcp;
_hour = tm->tm_hour;
_minute = tm->tm_min;
_second = tm->tm_sec;
+ _millisecond = 0;
set_local_time_zone ();
}
_hour = t.time_of_day().hours ();
_minute = t.time_of_day().minutes ();
_second = t.time_of_day().seconds ();
+ _millisecond = t.time_of_day().fractional_seconds () / 1000;
+ DCP_ASSERT (_millisecond < 1000);
set_local_time_zone ();
}
+/** Construct a LocalTime from a boost::posix_time::ptime and a time zone offset */
+LocalTime::LocalTime (boost::posix_time::ptime t, int tz_hour, int tz_minute)
+{
+ _year = t.date().year ();
+ _month = t.date().month ();
+ _day = t.date().day ();
+ _hour = t.time_of_day().hours ();
+ _minute = t.time_of_day().minutes ();
+ _second = t.time_of_day().seconds ();
+ _millisecond = t.time_of_day().fractional_seconds () / 1000;
+ DCP_ASSERT (_millisecond < 1000);
+
+ _tz_hour = tz_hour;
+ _tz_minute = tz_minute;
+}
+
/** Set our UTC offset to be according to the local time zone */
void
LocalTime::set_local_time_zone ()
_tz_minute = offset.minutes ();
}
-/** @param s A string of the form 2013-01-05T18:06:59+04:00 */
+/** @param s A string of the form 2013-01-05T18:06:59[.123]+04:00 */
LocalTime::LocalTime (string s)
{
- /* 2013-01-05T18:06:59+04:00 */
- /* 0123456789012345678901234 */
-
+ /* 2013-01-05T18:06:59+04:00 or 2013-01-05T18:06:59.123+04:00 */
+ /* 0123456789012345678901234 or 01234567890123456789012345678 */
+
if (s.length() < 25) {
throw TimeFormatError (s);
}
/* Check incidental characters */
- if (s[4] != '-' || s[7] != '-' || s[10] != 'T' || s[13] != ':' || s[16] != ':' || s[22] != ':') {
+ bool const common = s[4] == '-' && s[7] == '-' && s[10] == 'T' && s[13] == ':' && s[16] == ':';
+ bool const without_millisecond = common && s[22] == ':';
+ bool const with_millisecond = common && s[19] == '.' && s[26] == ':';
+
+ if (!with_millisecond && !without_millisecond) {
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));
- _tz_hour = lexical_cast<int> (s.substr (20, 2));
- _tz_minute = lexical_cast<int> (s.substr (23, 2));
+ if (without_millisecond) {
+ _millisecond = 0;
+ _tz_hour = lexical_cast<int> (s.substr (20, 2));
+ _tz_minute = lexical_cast<int> (s.substr (23, 2));
+ } else {
+ _millisecond = lexical_cast<int> (s.substr (20, 3));
+ _tz_hour = lexical_cast<int> (s.substr (24, 2));
+ _tz_minute = lexical_cast<int> (s.substr (27, 2));
+ }
- if (s[19] == '-') {
+ int const plus_minus_position = with_millisecond ? 23 : 19;
+
+ if (s[plus_minus_position] == '-') {
_tz_hour = -_tz_hour;
- } else if (s[19] != '+') {
+ } else if (s[plus_minus_position] != '+') {
throw TimeFormatError (s);
}
}
-/** @return A string of the form 2013-01-05T18:06:59+04:00 */
+/** @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 () const
+LocalTime::as_string (bool with_millisecond) const
{
char buffer[32];
snprintf (
buffer, sizeof (buffer),
"%sT%s%s%02d:%02d",
- date().c_str(), time_of_day().c_str(), (_tz_hour >= 0 ? "+" : "-"), abs (_tz_hour), _tz_minute
+ date().c_str(), time_of_day(with_millisecond).c_str(), (_tz_hour >= 0 ? "+" : "-"), abs (_tz_hour), _tz_minute
);
return buffer;
}
return buffer;
}
-/** @return The time in the form HH:MM:SS */
+/** @return The time in the form HH:MM:SS or HH:MM:SS.mmm */
string
-LocalTime::time_of_day () const
+LocalTime::time_of_day (bool with_millisecond) const
{
char buffer[32];
- snprintf (buffer, sizeof (buffer), "%02d:%02d:%02d", _hour, _minute, _second);
+ if (with_millisecond) {
+ snprintf (buffer, sizeof (buffer), "%02d:%02d:%02d.%03d", _hour, _minute, _second, _millisecond);
+ } else {
+ snprintf (buffer, sizeof (buffer), "%02d:%02d:%02d", _hour, _minute, _second);
+ }
return buffer;
}
+
+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;
+}
+
+bool
+LocalTime::operator!= (LocalTime const & other) const
+{
+ return !(*this == other);
+}
+
+ostream&
+dcp::operator<< (ostream& s, LocalTime const & t)
+{
+ s << t.as_string ();
+ return s;
+}
projects / libdcp.git / blobdiff