X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Fdatetime.cpp;h=e011f3b2ac0b8a3681048bd1c59e17194dbda03c;hp=8886139d245a3a662fdf4d7758b26ada00c6af15;hb=HEAD;hpb=c13c5d2e330e4cee177c1fd8e0b6153c7e2503e4

diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp
index 8886139..e011f3b 100644
--- a/source/time/datetime.cpp
+++ b/source/time/datetime.cpp
@@ -1,7 +1,7 @@
-/* $Id$ */
-#include <sstream>
-#include <iomanip>
-#include "../core/except.h"
+#include <cstdlib>
+#include <stdexcept>
+#include <msp/strings/format.h>
+#include <msp/strings/regex.h>
 #include "datetime.h"
 #include "timestamp.h"
 
@@ -9,10 +9,10 @@ using namespace std;
 
 namespace {
 
-inline bool is_leap_year(int32_t y)
+inline bool is_leap_year(int y)
 { return y%4==0 && (y%100 || y%400==0); }
 
-inline uint8_t month_days(int32_t y, uint8_t m)
+inline unsigned char month_days(int y, unsigned char m)
 {
 	switch(m)
 	{
@@ -29,7 +29,7 @@ inline uint8_t month_days(int32_t y, uint8_t m)
 }
 
 template<typename T>
-inline int cmp_(T a, T b)
+inline int _cmp(T a, T b)
 {
 	if(a<b)
 		return -1;
@@ -43,39 +43,26 @@ inline int cmp_(T a, T b)
 namespace Msp {
 namespace Time {
 
-DateTime::DateTime(const TimeStamp &ts):
-	year(1970),
-	month(1),
-	mday(1),
-	hour(0),
-	minute(0),
-	second(0),
-	usec(0)
+DateTime::DateTime(const TimeStamp &ts)
 {
 	add_raw(ts.raw());
 }
 
-DateTime::DateTime(int32_t y, uint8_t m, uint8_t d):
-	year(y),
-	month(m),
-	mday(d),
-	hour(0),
-	minute(0),
-	second(0),
-	usec(0)
+DateTime::DateTime(const TimeStamp &ts, const TimeZone &tz):
+	DateTime(ts)
+{
+	convert_timezone(tz);
+}
+
+DateTime::DateTime(int y, unsigned char m, unsigned char d):
+	DateTime(y, m, d, 0, 0, 0, 0)
 { }
 
-DateTime::DateTime(int32_t y, uint8_t m, uint8_t d, uint8_t h, uint8_t n, uint8_t s):
-	year(y),
-	month(m),
-	mday(d),
-	hour(h),
-	minute(n),
-	second(s),
-	usec(0)
+DateTime::DateTime(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s):
+	DateTime(y, m, d, h, n, s, 0)
 { }
 
-DateTime::DateTime(int32_t y, uint8_t m, uint8_t d, uint8_t h, uint8_t n, uint8_t s, uint32_t u):
+DateTime::DateTime(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s, unsigned u):
 	year(y),
 	month(m),
 	mday(d),
@@ -83,72 +70,137 @@ DateTime::DateTime(int32_t y, uint8_t m, uint8_t d, uint8_t h, uint8_t n, uint8_
 	minute(n),
 	second(s),
 	usec(u)
-{ }
+{
+	if(usec>=1000000)
+		throw out_of_range("DateTime::DateTime usec");
+	if(second>=60)
+		throw out_of_range("DateTime::DateTime second");
+	if(minute>=60)
+		throw out_of_range("DateTime::DateTime minute");
+	if(hour>=24)
+		throw out_of_range("DateTime::DateTime hour");
+	if(month<1 || month>12)
+		throw out_of_range("DateTime::DateTime month");
+	if(mday<1 || mday>month_days(year, month))
+		throw out_of_range("DateTime::DateTime mday");
+}
+
+DateTime DateTime::parse_rfc3339(const string &str)
+{
+	static Regex re("^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(.([0-9]+))?(Z|[-+]([0-9]{2}):([0-9]{2}))$");
+
+	RegMatch m = re.match(str);
+	if(!m)
+		throw invalid_argument("DateTime::parse_rfc3339");
+
+	unsigned year = lexical_cast<unsigned>(m[1].str);
+	unsigned month = lexical_cast<unsigned>(m[2].str);
+	unsigned mday = lexical_cast<unsigned>(m[3].str);
+	unsigned hr = lexical_cast<unsigned>(m[4].str);
+	unsigned minute = lexical_cast<unsigned>(m[5].str);
+	unsigned second = lexical_cast<unsigned>(m[6].str);
+	unsigned us = 0;
+	const string &sec_frac = m[8].str;
+	if(!sec_frac.empty())
+	{
+		us = lexical_cast<unsigned>(sec_frac);
+		for(unsigned i=sec_frac.size(); i<6; ++i)
+			us *= 10;
+		for(unsigned i=sec_frac.size(); i>6; --i)
+			us /= 10;
+	}
+
+	DateTime result = DateTime(year, month, mday, hr, minute, second, us);
+
+	int tzoff = 0;
+	if(m[9].str!="Z")
+	{
+		tzoff = lexical_cast<unsigned>(m[10].str)*60+lexical_cast<unsigned>(m[11].str);
+		if(m[9].str[0]=='-')
+			tzoff = -tzoff;
+	}
 
-void DateTime::add_days(int32_t days)
+	result.set_timezone(tzoff);
+
+	return result;
+}
+
+void DateTime::add_days(int days)
 {
-	unsigned new_year=year;
+	int new_year = year;
 
 	/* Leap years have a 400 year cycle, so any 400 consecutive years have a
-	constant number of days (400*365+97=146097) */
-	new_year+=days/146097*400;
-	days%=146097;
+	constant number of days (400*365+97 = 146097) */
+	new_year += days/146097*400;
+	days %= 146097;
 
 	if(days<0)
 	{
-		new_year-=400;
-		days+=146097;
+		new_year -= 400;
+		days += 146097;
 	}
 
 	// Fudge factor for leap day
-	int fudge=(month<=2)?1:0;
+	int fudge = (month<=2) ? 1 : 0;
 
 	// (Almost) every 4 year cycle has 1 leap year and 3 normal years
-	unsigned cycles=days/1461;
-	days%=1461;
+	unsigned cycles = days/1461;
+	days %= 1461;
 
-	new_year+=cycles*4;
+	new_year += cycles*4;
 
 	// See how many non-leap-years we counted as leap years and reclaim the lost days
-	unsigned missed_leap_days=((year-fudge)%100+cycles*4)/100;
+	// XXX This breaks with negative years
+	unsigned missed_leap_days = ((year-fudge)%100+cycles*4)/100;
 	if((year-fudge)%400+cycles*4>=400)
 		--missed_leap_days;
 
-	days+=missed_leap_days;
+	days += missed_leap_days;
 
 	// Count single years from the 4 year cycle
-	cycles=days/365;
-	days%=365;
+	cycles = days/365;
+	days %= 365;
 
-	new_year+=cycles;
+	new_year += cycles;
 
-	if((year-fudge)%4+cycles>=4)
+	if((year-fudge)%4+cycles>=4 && (new_year%100>=4 || new_year%400<4))
 	{
 		// We passed a leap year - decrement days
 		if(days==0)
 		{
+			days = is_leap_year(new_year-fudge) ? 365 : 364;
 			--new_year;
-			days=is_leap_year(new_year)?365:364;
 		}
 		else
 			--days;
 	}
 
-	year=new_year;
+	year = new_year;
 
 	// Step months
 	while(mday+days>month_days(year, month))
 	{
-		days-=month_days(year, month);
+		days -= month_days(year, month);
 		++month;
 		if(month>12)
 		{
 			++year;
-			month=1;
+			month = 1;
 		}
 	}
 
-	mday+=days;
+	mday += days;
+}
+
+void DateTime::set_timezone(const TimeZone &tz)
+{
+	zone = tz;
+}
+
+void DateTime::convert_timezone(const TimeZone &tz)
+{
+	add_raw((tz.get_offset()-zone.get_offset()).raw());
+	zone = tz;
 }
 
 DateTime DateTime::operator+(const TimeDelta &td) const
@@ -164,21 +216,34 @@ DateTime &DateTime::operator+=(const TimeDelta &td)
 	return *this;
 }
 
+DateTime DateTime::operator-(const TimeDelta &td) const
+{
+	DateTime dt(*this);
+	dt.add_raw(-td.raw());
+	return dt;
+}
+
+DateTime &DateTime::operator-=(const TimeDelta &td)
+{
+	add_raw(-td.raw());
+	return *this;
+}
+
 int DateTime::cmp(const DateTime &dt) const
 {
-	if(int c=cmp_(year, dt.year))
+	if(int c = _cmp(year, dt.year))
 		return c;
-	if(int c=cmp_(month, dt.month))
+	if(int c = _cmp(month, dt.month))
 		return c;
-	if(int c=cmp_(mday, dt.mday))
+	if(int c = _cmp(mday, dt.mday))
 		return c;
-	if(int c=cmp_(hour, dt.hour))
+	if(int c = _cmp(hour, dt.hour))
 		return c;
-	if(int c=cmp_(minute, dt.minute))
+	if(int c = _cmp(minute, dt.minute))
 		return c;
-	if(int c=cmp_(second, dt.second))
+	if(int c = _cmp(second, dt.second))
 		return c;
-	if(int c=cmp_(usec, dt.usec))
+	if(int c = _cmp(usec, dt.usec))
 		return c;
 	return 0;
 }
@@ -186,25 +251,24 @@ int DateTime::cmp(const DateTime &dt) const
 TimeStamp DateTime::get_timestamp() const
 {
 	if(year<-289701 || year>293641)
-		throw Exception("DateTime is not representable as a TimeStamp");
+		throw range_error("DateTime::get_timestamp");
 
-	int64_t raw=(((hour*60LL)+minute)*60+second)*1000000+usec;
-	int days=(year-1970)*365;
-	days+=(year-1)/4-(year-1)/100+(year-1)/400-477;
+	RawTime raw = (((hour*60LL)+minute)*60+second)*1000000+usec;
+	int days = (year-1970)*365;
+	days += (year-1)/4-(year-1)/100+(year-1)/400-477;
 	for(unsigned i=1; i<month; ++i)
-		days+=month_days(year, i);
-	days+=mday-1;
+		days += month_days(year, i);
+	days += mday-1;
 
-	raw+=days*86400000000LL;
+	raw += days*86400000000LL;
 
 	return TimeStamp(raw);
 }
 
 string DateTime::format(const string &fmt) const
 {
-	ostringstream ss;
-	ss.fill('0');
-	for(string::const_iterator i=fmt.begin(); i!=fmt.end(); ++i)
+	string result;
+	for(auto i=fmt.begin(); i!=fmt.end(); ++i)
 	{
 		if(*i=='%')
 		{
@@ -212,47 +276,62 @@ string DateTime::format(const string &fmt) const
 			if(i==fmt.end())
 				break;
 			else if(*i=='d')
-				ss<<setw(2)<<int(mday);
+				result += Msp::format("%02d", mday);
 			else if(*i=='H')
-				ss<<setw(2)<<int(hour);
+				result += Msp::format("%02d", hour);
 			else if(*i=='I')
-				ss<<setw(2)<<hour%12;
+				result += Msp::format("%02d", hour%12);
 			else if(*i=='m')
-				ss<<setw(2)<<int(month);
+				result += Msp::format("%02d", month);
 			else if(*i=='M')
-				ss<<setw(2)<<int(minute);
+				result += Msp::format("%02d", minute);
 			else if(*i=='p')
-				ss<<((hour>=12) ? "PM" : "AM");
+				result += ((hour>=12) ? "PM" : "AM");
 			else if(*i=='S')
-				ss<<setw(2)<<int(second);
+				result += Msp::format("%02d", second);
 			else if(*i=='y')
-				ss<<setw(2)<<year%100;
+				result += Msp::format("%02d", year%100);
 			else if(*i=='Y')
-				ss<<year;
+				result += Msp::format("%04d", year);
 			else if(*i=='%')
-				ss<<'%';
+				result += '%';
 		}
 		else
-			ss<<*i;
+			result += *i;
 	}
 
-	return ss.str();
+	return result;
+}
+
+string DateTime::format_rfc3339() const
+{
+	string result = format("%Y-%m-%dT%H:%M:%S");
+	if(usec)
+		result += Msp::format(".%06d", usec);
+	if(const TimeDelta &offs = zone.get_offset())
+	{
+		int m = abs(static_cast<int>(offs/Time::min));
+		result += Msp::format("%c%02d:%02d", (offs<zero ? '-' : '+'), m/60, m%60);
+	}
+	else
+		result += 'Z';
+	return result;
 }
 
-void DateTime::add_raw(int64_t raw)
+void DateTime::add_raw(RawTime raw)
 {
-	int32_t days=raw/86400000000LL;
-	raw%=86400000000LL;
+	int days = static_cast<int>(raw/86400000000LL);
+	raw %= 86400000000LL;
 	if(raw<0)
 	{
-		++days;
-		raw+=86400000000LL;
+		--days;
+		raw += 86400000000LL;
 	}
 
-	usec+=raw%1000000; raw/=1000000;
-	second+=raw%60;    raw/=60;
-	minute+=raw%60;    raw/=60;
-	hour+=raw%24;      raw/=24;
+	usec += raw%1000000; raw /= 1000000;
+	second += raw%60;    raw /= 60;
+	minute += raw%60;    raw /= 60;
+	hour += raw%24;      raw /= 24;
 
 	add_days(days);
 	normalize();
@@ -260,22 +339,22 @@ void DateTime::add_raw(int64_t raw)
 
 void DateTime::normalize()
 {
-	second+=usec/1000000;
-	usec%=1000000;
-	minute+=second/60;
-	second%=60;
-	hour+=minute/60;
-	minute%=60;
-	mday+=hour/24;
-	hour%=24;
+	second += usec/1000000;
+	usec %= 1000000;
+	minute += second/60;
+	second %= 60;
+	hour += minute/60;
+	minute %= 60;
+	mday += hour/24;
+	hour %= 24;
 	while(mday>month_days(year, month))
 	{
-		mday-=month_days(year, month);
+		mday -= month_days(year, month);
 		++month;
 		if(month>12)
 		{
 			++year;
-			month=1;
+			month = 1;
 		}
 	}
 }