Merge pull request #734 from Bond-009/culture

Fix more analyzer warnings

13 files changed, 32 insertions, 44 deletions

diff --git a/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs b/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
index 90b43bc59..460809e93 100644
--- a/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
+++ b/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
@@ -217,7 +217,7 @@ namespace Emby.Server.Implementations.AppBase
 
         private string GetConfigurationFile(string key)
         {
-            return Path.Combine(CommonApplicationPaths.ConfigurationDirectoryPath, key.ToLower() + ".xml");
+            return Path.Combine(CommonApplicationPaths.ConfigurationDirectoryPath, key.ToLowerInvariant() + ".xml");
         }
 
         public object GetConfiguration(string key)
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 9ea2389f4..3014e482d 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -3901,7 +3901,7 @@ namespace Emby.Server.Implementations.Data
                 // lowercase this because SortName is stored as lowercase
                 if (statement != null)
                 {
-                    statement.TryBind("@NameStartsWithOrGreater", query.NameStartsWithOrGreater.ToLower());
+                    statement.TryBind("@NameStartsWithOrGreater", query.NameStartsWithOrGreater.ToLowerInvariant());
                 }
             }
             if (!string.IsNullOrWhiteSpace(query.NameLessThan))
@@ -3910,7 +3910,7 @@ namespace Emby.Server.Implementations.Data
                 // lowercase this because SortName is stored as lowercase
                 if (statement != null)
                 {
-                    statement.TryBind("@NameLessThan", query.NameLessThan.ToLower());
+                    statement.TryBind("@NameLessThan", query.NameLessThan.ToLowerInvariant());
                 }
             }
 
@@ -4814,7 +4814,7 @@ namespace Emby.Server.Implementations.Data
                 return value;
             }
 
-            return value.RemoveDiacritics().ToLower();
+            return value.RemoveDiacritics().ToLowerInvariant();
         }
 
         private bool EnableGroupByPresentationUniqueKey(InternalItemsQuery query)
diff --git a/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs b/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
index a61247fd1..6ea1bd08e 100644
--- a/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
+++ b/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
@@ -264,7 +264,7 @@ namespace Emby.Server.Implementations.HttpClientManager
             }
 
             var url = options.Url;
-            var urlHash = url.ToLower().GetMD5().ToString("N");
+            var urlHash = url.ToLowerInvariant().GetMD5().ToString("N");
 
             var responseCachePath = Path.Combine(_appPaths.CachePath, "httpclient", urlHash);
 
@@ -374,11 +374,11 @@ namespace Emby.Server.Implementations.HttpClientManager
             {
                 if (options.LogRequestAsDebug)
                 {
-                    _logger.LogDebug("HttpClientManager {0}: {1}", httpMethod.ToUpper(), options.Url);
+                    _logger.LogDebug("HttpClientManager {0}: {1}", httpMethod.ToUpper(CultureInfo.CurrentCulture), options.Url);
                 }
                 else
                 {
-                    _logger.LogInformation("HttpClientManager {0}: {1}", httpMethod.ToUpper(), options.Url);
+                    _logger.LogInformation("HttpClientManager {0}: {1}", httpMethod.ToUpper(CultureInfo.CurrentCulture), options.Url);
                 }
             }
 
diff --git a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
index 0ad4d8406..7445fd3c2 100644
--- a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -394,7 +394,7 @@ namespace Emby.Server.Implementations.HttpServer
         {
             return contentType == null
                        ? null
-                       : contentType.Split(';')[0].ToLower().Trim();
+                       : contentType.Split(';')[0].ToLowerInvariant().Trim();
         }
 
         private static string SerializeToXmlString(object from)
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 3e2ff0b2a..064006ebd 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -512,7 +512,7 @@ namespace Emby.Server.Implementations.Library
 
             if (forceCaseInsensitive || !ConfigurationManager.Configuration.EnableCaseSensitiveItemIds)
             {
-                key = key.ToLower();
+                key = key.ToLowerInvariant();
             }
 
             key = type.FullName + key;
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 6a2a46c9f..4e68bb545 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -2193,7 +2193,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
                     if (lockData)
                     {
-                        writer.WriteElementString("lockdata", true.ToString().ToLower());
+                        writer.WriteElementString("lockdata", true.ToString(CultureInfo.InvariantCulture).ToLowerInvariant());
                     }
 
                     if (item.CriticRating.HasValue)
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs b/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
index 724e8afdf..1144c9ab1 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
@@ -399,7 +399,7 @@ namespace Emby.Server.Implementations.LiveTv
         {
             var name = serviceName + externalId + InternalVersionNumber;
 
-            return _libraryManager.GetNewItemId(name.ToLower(), typeof(LiveTvChannel));
+            return _libraryManager.GetNewItemId(name.ToLowerInvariant(), typeof(LiveTvChannel));
         }
 
         private const string ServiceName = "Emby";
@@ -407,21 +407,21 @@ namespace Emby.Server.Implementations.LiveTv
         {
             var name = ServiceName + externalId + InternalVersionNumber;
 
-            return name.ToLower().GetMD5().ToString("N");
+            return name.ToLowerInvariant().GetMD5().ToString("N");
         }
 
         public Guid GetInternalSeriesTimerId(string externalId)
         {
             var name = ServiceName + externalId + InternalVersionNumber;
 
-            return name.ToLower().GetMD5();
+            return name.ToLowerInvariant().GetMD5();
         }
 
         public Guid GetInternalProgramId(string externalId)
         {
             var name = ServiceName + externalId + InternalVersionNumber;
 
-            return _libraryManager.GetNewItemId(name.ToLower(), typeof(LiveTvProgram));
+            return _libraryManager.GetNewItemId(name.ToLowerInvariant(), typeof(LiveTvProgram));
         }
 
         public async Task<TimerInfo> GetTimerInfo(TimerInfoDto dto, bool isNew, LiveTvManager liveTv, CancellationToken cancellationToken)
diff --git a/Emby.Server.Implementations/Localization/LocalizationManager.cs b/Emby.Server.Implementations/Localization/LocalizationManager.cs
index 7af8cf18c..3c2f9b427 100644
--- a/Emby.Server.Implementations/Localization/LocalizationManager.cs
+++ b/Emby.Server.Implementations/Localization/LocalizationManager.cs
@@ -492,11 +492,11 @@ namespace Emby.Server.Implementations.Localization
 
             if (parts.Length == 2)
             {
-                culture = parts[0].ToLower() + "-" + parts[1].ToUpper();
+                culture = parts[0].ToLowerInvariant() + "-" + parts[1].ToUpperInvariant();
             }
             else
             {
-                culture = culture.ToLower();
+                culture = culture.ToLowerInvariant();
             }
 
             return culture + ".json";
diff --git a/Emby.Server.Implementations/Services/RequestHelper.cs b/Emby.Server.Implementations/Services/RequestHelper.cs
index 24e9cbfa4..2563cac99 100644
--- a/Emby.Server.Implementations/Services/RequestHelper.cs
+++ b/Emby.Server.Implementations/Services/RequestHelper.cs
@@ -45,7 +45,7 @@ namespace Emby.Server.Implementations.Services
         {
             return contentType == null
                        ? null
-                       : contentType.Split(';')[0].ToLower().Trim();
+                       : contentType.Split(';')[0].ToLowerInvariant().Trim();
         }
 
     }
diff --git a/Emby.Server.Implementations/Services/ServiceExec.cs b/Emby.Server.Implementations/Services/ServiceExec.cs
index 45c918fa1..aa67a3601 100644
--- a/Emby.Server.Implementations/Services/ServiceExec.cs
+++ b/Emby.Server.Implementations/Services/ServiceExec.cs
@@ -98,7 +98,7 @@ namespace Emby.Server.Implementations.Services
                 return Task.FromResult(response);
             }
 
-            var expectedMethodName = actionName.Substring(0, 1) + actionName.Substring(1).ToLower();
+            var expectedMethodName = actionName.Substring(0, 1) + actionName.Substring(1).ToLowerInvariant();
             throw new NotImplementedException(string.Format("Could not find method named {1}({0}) or Any({0}) on Service {2}", requestDto.GetType().GetMethodName(), expectedMethodName, serviceType.GetMethodName()));
         }
 
diff --git a/Emby.Server.Implementations/Services/ServiceMethod.cs b/Emby.Server.Implementations/Services/ServiceMethod.cs
index 7add72815..5018bf4a2 100644
--- a/Emby.Server.Implementations/Services/ServiceMethod.cs
+++ b/Emby.Server.Implementations/Services/ServiceMethod.cs
@@ -11,7 +11,7 @@ namespace Emby.Server.Implementations.Services
 
         public static string Key(Type serviceType, string method, string requestDtoName)
         {
-            return serviceType.FullName + " " + method.ToUpper() + " " + requestDtoName;
+            return serviceType.FullName + " " + method.ToUpperInvariant() + " " + requestDtoName;
         }
     }
 }
diff --git a/Emby.Server.Implementations/Services/ServicePath.cs b/Emby.Server.Implementations/Services/ServicePath.cs
index 7e1993b71..f575baca3 100644
--- a/Emby.Server.Implementations/Services/ServicePath.cs
+++ b/Emby.Server.Implementations/Services/ServicePath.cs
@@ -60,7 +60,7 @@ namespace Emby.Server.Implementations.Services
 
         public static string[] GetPathPartsForMatching(string pathInfo)
         {
-            return pathInfo.ToLower().Split(new[] { PathSeperatorChar }, StringSplitOptions.RemoveEmptyEntries);
+            return pathInfo.ToLowerInvariant().Split(new[] { PathSeperatorChar }, StringSplitOptions.RemoveEmptyEntries);
         }
 
         public static List<string> GetFirstMatchHashKeys(string[] pathPartsForMatching)
@@ -104,7 +104,7 @@ namespace Emby.Server.Implementations.Services
             this.Description = description;
             this.restPath = path;
 
-            this.Verbs = string.IsNullOrWhiteSpace(verbs) ? ServiceExecExtensions.AllVerbs : verbs.ToUpper().Split(new[] { ' ', ',' }, StringSplitOptions.RemoveEmptyEntries);
+            this.Verbs = string.IsNullOrWhiteSpace(verbs) ? ServiceExecExtensions.AllVerbs : verbs.ToUpperInvariant().Split(new[] { ' ', ',' }, StringSplitOptions.RemoveEmptyEntries);
 
             var componentsList = new List<string>();
 
@@ -154,7 +154,7 @@ namespace Emby.Server.Implementations.Services
                 }
                 else
                 {
-                    this.literalsToMatch[i] = component.ToLower();
+                    this.literalsToMatch[i] = component.ToLowerInvariant();
 
                     if (firstLiteralMatch == null)
                     {
@@ -189,7 +189,7 @@ namespace Emby.Server.Implementations.Services
             foreach (var propertyInfo in GetSerializableProperties(RequestType))
             {
                 var propertyName = propertyInfo.Name;
-                propertyNamesMap.Add(propertyName.ToLower(), propertyName);
+                propertyNamesMap.Add(propertyName.ToLowerInvariant(), propertyName);
             }
         }
 
@@ -483,7 +483,7 @@ namespace Emby.Server.Implementations.Services
                     continue;
                 }
 
-                if (!this.propertyNamesMap.TryGetValue(variableName.ToLower(), out var propertyNameOnRequest))
+                if (!this.propertyNamesMap.TryGetValue(variableName.ToLowerInvariant(), out var propertyNameOnRequest))
                 {
                     if (string.Equals("ignore", variableName, StringComparison.OrdinalIgnoreCase))
                     {
diff --git a/Emby.Server.Implementations/Services/SwaggerService.cs b/Emby.Server.Implementations/Services/SwaggerService.cs
index 9bceeabec..3e6970eef 100644
--- a/Emby.Server.Implementations/Services/SwaggerService.cs
+++ b/Emby.Server.Implementations/Services/SwaggerService.cs
@@ -216,40 +216,28 @@ namespace Emby.Server.Implementations.Services
             {
                 var responses = new Dictionary<string, SwaggerResponse>
                 {
+                    { "200", new SwaggerResponse { description = "OK" } }
                 };
 
-                responses["200"] = new SwaggerResponse
+                var apiKeySecurity = new Dictionary<string, string[]>
                 {
-                    description = "OK"
+                    { "api_key",  Array.Empty<string>() }
                 };
 
-                var security = new List<Dictionary<string, string[]>>();
-
-                var apiKeySecurity = new Dictionary<string, string[]>();
-                apiKeySecurity["api_key"] = Array.Empty<string>();
-
-                security.Add(apiKeySecurity);
-
-                result[verb.ToLower()] = new SwaggerMethod
+                result[verb.ToLowerInvariant()] = new SwaggerMethod
                 {
                     summary = info.Summary,
                     description = info.Description,
-                    produces = new[]
-                    {
-                        "application/json"
-                    },
-                    consumes = new[]
-                    {
-                        "application/json"
-                    },
+                    produces = new[] { "application/json" },
+                    consumes = new[] { "application/json" },
                     operationId = info.RequestType.Name,
                     tags = Array.Empty<string>(),
 
-                    parameters = new SwaggerParam[] { },
+                    parameters = Array.Empty<SwaggerParam>(),
 
                     responses = responses,
 
-                    security = security.ToArray()
+                    security = new [] { apiKeySecurity }
                 };
             }