Allow TimeSpans to parse C# TimeSpan and xsd:duration strings

mythz · mythz · commit 560194c93633 · 2012-05-24T15:20:27.000-04:00
diff --git a/src/ServiceStack.Text/Common/DateTimeSerializer.cs b/src/ServiceStack.Text/Common/DateTimeSerializer.cs
@@ -111,14 +111,28 @@ public static DateTime ParseXsdDateTime(string dateTimeStr)
 			return XmlConvert.ToDateTime(dateTimeStr, XmlDateTimeSerializationMode.Utc);
 		}
 
+        public static TimeSpan ParseTimeSpan(string dateTimeStr)
+        {
+            return dateTimeStr.StartsWith("P") || dateTimeStr.StartsWith("-P")
+                ? ParseXsdTimeSpan(dateTimeStr)
+                : TimeSpan.Parse(dateTimeStr);
+        }
+
         public static TimeSpan ParseXsdTimeSpan(string dateTimeStr)
         {
             return XmlConvert.ToTimeSpan(dateTimeStr);
         }
 
+        public static TimeSpan? ParseNullableTimeSpan(string dateTimeStr)
+        {
+            return string.IsNullOrEmpty(dateTimeStr) 
+                ? (TimeSpan?) null 
+                : ParseTimeSpan(dateTimeStr);
+        }
+
         public static TimeSpan? ParseXsdNullableTimeSpan(string dateTimeStr)
         {
-            return String.IsNullOrEmpty(dateTimeStr) ? 
+            return String.IsNullOrEmpty(dateTimeStr) ?
                 null :
                 new TimeSpan?(XmlConvert.ToTimeSpan(dateTimeStr));
         }
diff --git a/src/ServiceStack.Text/Common/DeserializeBuiltin.cs b/src/ServiceStack.Text/Common/DeserializeBuiltin.cs
@@ -59,9 +59,9 @@ private static ParseStringDelegate GetParseFn()
 			if (typeof(T) == typeof(DateTimeOffset) || typeof(T) == typeof(DateTimeOffset?))
 				return value => DateTimeSerializer.ParseDateTimeOffset(value);
             if (typeof(T) == typeof(TimeSpan))
-                return value => DateTimeSerializer.ParseXsdTimeSpan(value);
+                return value => DateTimeSerializer.ParseTimeSpan(value);
 			if (typeof(T) == typeof(TimeSpan?))
-                return value => DateTimeSerializer.ParseXsdNullableTimeSpan(value);
+                return value => DateTimeSerializer.ParseNullableTimeSpan(value);
 #if !MONOTOUCH && !SILVERLIGHT && !XBOX
 			if (typeof(T) == typeof(System.Data.Linq.Binary))
 				return value => new System.Data.Linq.Binary(Convert.FromBase64String(value));
diff --git a/src/ServiceStack.Text/Env.cs b/src/ServiceStack.Text/Env.cs
@@ -23,7 +23,7 @@ static Env()
 				+ (IsMonoTouch ? " MonoTouch" : "");
 		}
 
-		public static decimal ServiceStackVersion = 3.78m;
+		public static decimal ServiceStackVersion = 3.79m;
 
 		public static bool IsUnix { get; set; }
 
diff --git a/src/ServiceStack.Text/Properties/AssemblyInfo.cs b/src/ServiceStack.Text/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.7.8.0")]
+[assembly: AssemblyVersion("3.7.9.0")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]

Original file line number	Diff line number	Diff line change
`@@ -111,14 +111,28 @@ public static DateTime ParseXsdDateTime(string dateTimeStr)`
`111`	`111`	`return XmlConvert.ToDateTime(dateTimeStr, XmlDateTimeSerializationMode.Utc);`
`112`	`112`	`}`
`113`	`113`
	`114`	`+ public static TimeSpan ParseTimeSpan(string dateTimeStr)`
	`115`	`+ {`
	`116`	`+ return dateTimeStr.StartsWith("P") \|\| dateTimeStr.StartsWith("-P")`
	`117`	`+ ? ParseXsdTimeSpan(dateTimeStr)`
	`118`	`+ : TimeSpan.Parse(dateTimeStr);`
	`119`	`+ }`
	`120`	`+`
`114`	`121`	`public static TimeSpan ParseXsdTimeSpan(string dateTimeStr)`
`115`	`122`	`{`
`116`	`123`	`return XmlConvert.ToTimeSpan(dateTimeStr);`
`117`	`124`	`}`
`118`	`125`
	`126`	`+ public static TimeSpan? ParseNullableTimeSpan(string dateTimeStr)`
	`127`	`+ {`
	`128`	`+ return string.IsNullOrEmpty(dateTimeStr)`
	`129`	`+ ? (TimeSpan?) null`
	`130`	`+ : ParseTimeSpan(dateTimeStr);`
	`131`	`+ }`
	`132`	`+`
`119`	`133`	`public static TimeSpan? ParseXsdNullableTimeSpan(string dateTimeStr)`
`120`	`134`	`{`
`121`		`- return String.IsNullOrEmpty(dateTimeStr) ?`
	`135`	`+ return String.IsNullOrEmpty(dateTimeStr) ?`
`122`	`136`	`null :`
`123`	`137`	`new TimeSpan?(XmlConvert.ToTimeSpan(dateTimeStr));`
`124`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ static Env()`
`23`	`23`	`+ (IsMonoTouch ? " MonoTouch" : "");`
`24`	`24`	`}`
`25`	`25`
`26`		`- public static decimal ServiceStackVersion = 3.78m;`
	`26`	`+ public static decimal ServiceStackVersion = 3.79m;`
`27`	`27`
`28`	`28`	`public static bool IsUnix { get; set; }`
`29`	`29`