mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2024-11-19 18:11:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing warnings on invariant culture, hate this for being so verbose

Browse Source
This commit is contained in:
rockstardev 2018-11-30 02:51:23 -06:00
parent 8509a0de18
commit a4bec83ecc
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer/Controllers/InvoiceController.UI.cs
View File

@ -483,7 +483,7 @@ namespace BTCPayServer.Controllers
var cd = new ContentDisposition var cd = new ContentDisposition
{ {
FileName = $"btcpay-export-{DateTime.UtcNow.ToString("yyyyMMdd-HHmmss")}.{format}", FileName = $"btcpay-export-{DateTime.UtcNow.ToString("yyyyMMdd-HHmmss", CultureInfo.InvariantCulture)}.{format}",
Inline = true Inline = true
}; };
Response.Headers.Add("Content-Disposition", cd.ToString()); Response.Headers.Add("Content-Disposition", cd.ToString());

23
BTCPayServer/Services/Invoices/Export/CsvSerializer.cs
View File

@ -2,6 +2,7 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
@ -13,17 +14,16 @@ namespace BTCPayServer.Services.Invoices.Export
/// <summary> /// <summary>
/// Serialize and Deserialize Lists of any object type to CSV. /// Serialize and Deserialize Lists of any object type to CSV.
/// </summary> /// </summary>
#pragma warning disable CA1305 // Specify IFormatProvider
public class CsvSerializer<T> where T : class, new() public class CsvSerializer<T> where T : class, new()
{ {
private List<PropertyInfo> _properties; private List<PropertyInfo> _properties;
public bool IgnoreEmptyLines { get; set; } = true; public bool IgnoreEmptyLines { get; set; } = true;
public bool IgnoreReferenceTypesExceptString { get; set; } = true; public bool IgnoreReferenceTypesExceptString { get; set; } = true;
public string NewlineReplacement { get; set; } = ((char)0x254).ToString(); public string NewlineReplacement { get; set; } = ((char)0x254).ToString(CultureInfo.InvariantCulture);
public char Separator { get; set; } = ','; public char Separator { get; set; } = ',';
public string Replacement { get; set; } = ((char)0x255).ToString(); public string Replacement { get; set; } = ((char)0x255).ToString(CultureInfo.InvariantCulture);
public string RowNumberColumnTitle { get; set; } = "RowNumber"; public string RowNumberColumnTitle { get; set; } = "RowNumber";
public bool UseLineNumbers { get; set; } = false; public bool UseLineNumbers { get; set; } = false;
@ -75,7 +75,7 @@ namespace BTCPayServer.Services.Invoices.Export
if (UseLineNumbers) if (UseLineNumbers)
{ {
values.Add(row++.ToString()); values.Add(row++.ToString(CultureInfo.InvariantCulture));
} }
foreach (var p in _properties) foreach (var p in _properties)
@ -83,17 +83,17 @@ namespace BTCPayServer.Services.Invoices.Export
var raw = p.GetValue(item); var raw = p.GetValue(item);
var value = raw == null ? "" : var value = raw == null ? "" :
raw.ToString() raw.ToString()
.Replace(Separator.ToString(), Replacement) .Replace(Separator.ToString(CultureInfo.InvariantCulture), Replacement, StringComparison.OrdinalIgnoreCase)
.Replace(Environment.NewLine, NewlineReplacement); .Replace(Environment.NewLine, NewlineReplacement, StringComparison.OrdinalIgnoreCase);
if (UseTextQualifier) if (UseTextQualifier)
{ {
value = string.Format("\"{0}\"", value); value = String.Format(CultureInfo.InvariantCulture, "\"{0}\"", value);
} }
values.Add(value); values.Add(value);
} }
sb.AppendLine(string.Join(Separator.ToString(), values.ToArray())); sb.AppendLine(String.Join(Separator.ToString(CultureInfo.InvariantCulture), values.ToArray()));
} }
if (UseEofLiteral) if (UseEofLiteral)
@ -102,12 +102,12 @@ namespace BTCPayServer.Services.Invoices.Export
if (UseLineNumbers) if (UseLineNumbers)
{ {
values.Add(row++.ToString()); values.Add(row++.ToString(CultureInfo.InvariantCulture));
} }
values.Add("EOF"); values.Add("EOF");
sb.AppendLine(string.Join(Separator.ToString(), values.ToArray())); sb.AppendLine(string.Join(Separator.ToString(CultureInfo.InvariantCulture), values.ToArray()));
} }
return sb.ToString(); return sb.ToString();
@ -126,10 +126,9 @@ namespace BTCPayServer.Services.Invoices.Export
header = new string[] { RowNumberColumnTitle }.Union(header); header = new string[] { RowNumberColumnTitle }.Union(header);
} }
return string.Join(Separator.ToString(), header.ToArray()); return string.Join(Separator.ToString(CultureInfo.InvariantCulture), header.ToArray());
} }
} }
#pragma warning restore CA1305 // Specify IFormatProvider
public class CsvIgnoreAttribute : Attribute { } public class CsvIgnoreAttribute : Attribute { }