Add support for CsvConfig.RealNumberCultureInfo to modify CSV format of real numbers

Author: mythz

src/ServiceStack.Text/Common/JsState.cs

@@ -21,6 +21,9 @@ internal static class JsState
         [ThreadStatic]
         internal static int Depth = 0;
 
+        [ThreadStatic]
+        internal static bool IsCsv = false;
+
 
         [ThreadStatic]
         internal static HashSet<Type> InSerializerFns = new HashSet<Type>();

src/ServiceStack.Text/CsvConfig.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using ServiceStack.Text.Common;
 
 namespace ServiceStack.Text
@@ -11,6 +12,13 @@ static CsvConfig()
             Reset();
         }
 
+        private static CultureInfo sRealNumberCultureInfo;
+        public static CultureInfo RealNumberCultureInfo
+        {
+            get { return sRealNumberCultureInfo ?? CultureInfo.InvariantCulture; }
+            set { sRealNumberCultureInfo = value; }
+        }
+
         [ThreadStatic]
         private static string tsItemSeperatorString;
         private static string sItemSeperatorString;

src/ServiceStack.Text/CsvSerializer.cs

@@ -164,7 +164,8 @@ private static WriteObjectDelegate GetWriteFn()
 
                     if (propertyInfo.PropertyType == typeof(string)
                         || propertyInfo.PropertyType.IsValueType()
-                        || propertyInfo.PropertyType == typeof(byte[])) continue;
+                        || propertyInfo.PropertyType == typeof(byte[]))
+                        continue;
 
                     if (firstCandidate == null)
                     {
@@ -263,7 +264,16 @@ static CsvSerializer()
 
         public static void WriteObject(TextWriter writer, object value)
         {
-            CacheFn(writer, value);
+            var hold = JsState.IsCsv;
+            JsState.IsCsv = true;
+            try
+            {
+                CacheFn(writer, value);
+            }
+            finally
+            {
+                JsState.IsCsv = hold;
+            }
         }
     }
 }

src/ServiceStack.Text/Jsv/JsvTypeSerializer.cs

@@ -222,26 +222,32 @@ public void WriteFloat(TextWriter writer, object floatValue)
 		{
 			if (floatValue == null) return;
 			var floatVal = (float)floatValue;
-			if (Equals(floatVal, float.MaxValue) || Equals(floatVal, float.MinValue))
-				writer.Write(floatVal.ToString("r", CultureInfo.InvariantCulture));
+            var cultureInfo = JsState.IsCsv ? CsvConfig.RealNumberCultureInfo : null;
+
+            if (Equals(floatVal, float.MaxValue) || Equals(floatVal, float.MinValue))
+				writer.Write(floatVal.ToString("r", cultureInfo ?? CultureInfo.InvariantCulture));
 			else
-				writer.Write(floatVal.ToString(CultureInfo.InvariantCulture));
+				writer.Write(floatVal.ToString(cultureInfo ?? CultureInfo.InvariantCulture));
 		}
 
 		public void WriteDouble(TextWriter writer, object doubleValue)
 		{
 			if (doubleValue == null) return;
 			var doubleVal = (double)doubleValue;
-			if (Equals(doubleVal, double.MaxValue) || Equals(doubleVal, double.MinValue))
-				writer.Write(doubleVal.ToString("r", CultureInfo.InvariantCulture));
+            var cultureInfo = JsState.IsCsv ? CsvConfig.RealNumberCultureInfo : null;
+
+            if (Equals(doubleVal, double.MaxValue) || Equals(doubleVal, double.MinValue))
+				writer.Write(doubleVal.ToString("r", cultureInfo ?? CultureInfo.InvariantCulture));
 			else
-				writer.Write(doubleVal.ToString(CultureInfo.InvariantCulture));
+				writer.Write(doubleVal.ToString(cultureInfo ?? CultureInfo.InvariantCulture));
 		}
 
 		public void WriteDecimal(TextWriter writer, object decimalValue)
 		{
 			if (decimalValue == null) return;
-			writer.Write(((decimal)decimalValue).ToString(CultureInfo.InvariantCulture));
+            var cultureInfo = JsState.IsCsv ? CsvConfig.RealNumberCultureInfo : null;
+
+            writer.Write(((decimal)decimalValue).ToString(cultureInfo ?? CultureInfo.InvariantCulture));
 		}
 
 		public void WriteEnum(TextWriter writer, object enumValue)

tests/ServiceStack.Text.Tests/CustomCultureInfoTests.cs

@@ -0,0 +1,35 @@
+using System.Globalization;
+using NUnit.Framework;
+using ServiceStack.Text.Tests.Support;
+
+namespace ServiceStack.Text.Tests
+{
+    [TestFixture]
+    public class CustomCultureInfoTests
+        : TestBase
+    {
+        [Test]
+        public void Does_not_use_custom_decimal()
+        {
+            CsvConfig.RealNumberCultureInfo = CultureInfo.CreateSpecificCulture("nl-NL");
+
+            var num = new NumberTypes
+            {
+                Int = 1111,
+                Float = 2222.2222f,
+                Double = 3333.3333,
+                Decimal = 4444.4444M,
+            };
+
+            num.ToJson().Print();
+            num.ToJsv().Print();
+            num.ToCsv().Print();
+
+            Assert.That(num.ToJson(), Is.StringContaining("4444.4444"));
+            Assert.That(num.ToJsv(), Is.StringContaining("4444.4444"));
+            Assert.That(num.ToCsv(), Is.StringContaining("4444,4444"));
+
+            CsvConfig.RealNumberCultureInfo = null;
+        }
+    }
+}