1 files changed, 32 insertions, 32 deletions
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index c9495c574..0f9770e8f 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -24,7 +24,7 @@ using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Reflection;
@@ -667,7 +667,7 @@ namespace Emby.Server.Implementations.Data
                         var userDataKey = tuple.Item4;
 
                         SaveItem(item, topParent, userDataKey, saveItemStatement);
-                        //Logger.Debug(_saveItemCommand.CommandText);
+                        //logger.LogDebug(_saveItemCommand.CommandText);
 
                         var inheritedTags = tuple.Item5;
 
@@ -886,12 +886,12 @@ namespace Emby.Server.Implementations.Data
 
             if (topParent != null)
             {
-                //Logger.Debug("Item {0} has top parent {1}", item.Id, topParent.Id);
+                //logger.LogDebug("Item {0} has top parent {1}", item.Id, topParent.Id);
                 saveItemStatement.TryBind("@TopParentId", topParent.Id.ToString("N"));
             }
             else
             {
-                //Logger.Debug("Item {0} has null top parent", item.Id);
+                //logger.LogDebug("Item {0} has null top parent", item.Id);
                 saveItemStatement.TryBindNull("@TopParentId");
             }
 
@@ -1148,7 +1148,7 @@ namespace Emby.Server.Implementations.Data
                 }
             }
 
-            item.ImageInfos = list.ToArray(list.Count);
+            item.ImageInfos = list.ToArray();
         }
 
         public string ToValueString(ItemImageInfo image)
@@ -1230,7 +1230,7 @@ namespace Emby.Server.Implementations.Data
             }
 
             CheckDisposed();
-            //Logger.Info("Retrieving item {0}", id.ToString("N"));
+            //logger.LogInformation("Retrieving item {0}", id.ToString("N"));
             using (WriteLock.Read())
             {
                 using (var connection = CreateConnection(true))
@@ -1345,7 +1345,7 @@ namespace Emby.Server.Implementations.Data
 
             if (type == null)
             {
-                //Logger.Debug("Unknown type {0}", typeString);
+                //logger.LogDebug("Unknown type {0}", typeString);
 
                 return null;
             }
@@ -1364,7 +1364,7 @@ namespace Emby.Server.Implementations.Data
                     }
                     catch (SerializationException ex)
                     {
-                        Logger.ErrorException("Error deserializing item", ex);
+                        Logger.LogError(ex, "Error deserializing item");
                     }
                 }
             }
@@ -2566,7 +2566,7 @@ namespace Emby.Server.Implementations.Data
                 excludeIds.Add(item.Id);
                 excludeIds.AddRange(item.ExtraIds);
 
-                query.ExcludeItemIds = excludeIds.ToArray(excludeIds.Count);
+                query.ExcludeItemIds = excludeIds.ToArray();
                 query.ExcludeProviderIds = item.ProviderIds;
             }
 
@@ -2587,7 +2587,7 @@ namespace Emby.Server.Implementations.Data
                 list.Add(builder.ToString());
             }
 
-            return list.ToArray(list.Count);
+            return list.ToArray();
         }
 
         private void BindSearchParams(InternalItemsQuery query, IStatement statement)
@@ -2666,7 +2666,7 @@ namespace Emby.Server.Implementations.Data
 
             if (groups.Count > 0)
             {
-                return " Group by " + string.Join(",", groups.ToArray(groups.Count));
+                return " Group by " + string.Join(",", groups.ToArray());
             }
 
             return string.Empty;
@@ -2686,7 +2686,7 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
 
-            //Logger.Info("GetItemList: " + _environmentInfo.StackTrace);
+            //logger.LogInformation("GetItemList: " + _environmentInfo.StackTrace);
 
             var now = DateTime.UtcNow;
 
@@ -2703,7 +2703,7 @@ namespace Emby.Server.Implementations.Data
 
             var whereText = whereClauses.Count == 0 ?
                 string.Empty :
-                " where " + string.Join(" AND ", whereClauses.ToArray(whereClauses.Count));
+                " where " + string.Join(" AND ", whereClauses.ToArray());
 
             commandText += whereText;
 
@@ -2744,7 +2744,7 @@ namespace Emby.Server.Implementations.Data
 
             CheckDisposed();
 
-            //Logger.Info("GetItemList: " + _environmentInfo.StackTrace);
+            //logger.LogInformation("GetItemList: " + _environmentInfo.StackTrace);
 
             var now = DateTime.UtcNow;
 
@@ -2761,7 +2761,7 @@ namespace Emby.Server.Implementations.Data
 
             var whereText = whereClauses.Count == 0 ?
                 string.Empty :
-                " where " + string.Join(" AND ", whereClauses.ToArray(whereClauses.Count));
+                " where " + string.Join(" AND ", whereClauses.ToArray());
 
             commandText += whereText;
 
@@ -2910,14 +2910,14 @@ namespace Emby.Server.Implementations.Data
 
             if (elapsed >= slowThreshold)
             {
-                Logger.Debug("{2} query time (slow): {0}ms. Query: {1}",
+                Logger.LogDebug("{2} query time (slow): {0}ms. Query: {1}",
                     Convert.ToInt32(elapsed),
                     commandText,
                     methodName);
             }
             else
             {
-                //Logger.Debug("{2} query time: {0}ms. Query: {1}",
+                //logger.LogDebug("{2} query time: {0}ms. Query: {1}",
                 //    Convert.ToInt32(elapsed),
                 //    commandText,
                 //    methodName);
@@ -2938,11 +2938,11 @@ namespace Emby.Server.Implementations.Data
                 var returnList = GetItemList(query);
                 return new QueryResult<BaseItem>
                 {
-                    Items = returnList.ToArray(returnList.Count),
+                    Items = returnList.ToArray(),
                     TotalRecordCount = returnList.Count
                 };
             }
-            //Logger.Info("GetItems: " + _environmentInfo.StackTrace);
+            //logger.LogInformation("GetItems: " + _environmentInfo.StackTrace);
 
             var now = DateTime.UtcNow;
 
@@ -2961,7 +2961,7 @@ namespace Emby.Server.Implementations.Data
 
             var whereText = whereClauses.Count == 0 ?
                 string.Empty :
-                " where " + string.Join(" AND ", whereClauses.ToArray(whereClauses.Count));
+                " where " + string.Join(" AND ", whereClauses.ToArray());
 
             var whereTextWithoutPaging = whereText;
 
@@ -3079,7 +3079,7 @@ namespace Emby.Server.Implementations.Data
 
                         LogQueryTime("GetItems", commandText, now);
 
-                        result.Items = list.ToArray(list.Count);
+                        result.Items = list.ToArray();
                         return result;
 
                     }, ReadTransactionMode);
@@ -3216,7 +3216,7 @@ namespace Emby.Server.Implementations.Data
             }
 
             CheckDisposed();
-            //Logger.Info("GetItemIdsList: " + _environmentInfo.StackTrace);
+            //logger.LogInformation("GetItemIdsList: " + _environmentInfo.StackTrace);
 
             var now = DateTime.UtcNow;
 
@@ -3227,7 +3227,7 @@ namespace Emby.Server.Implementations.Data
 
             var whereText = whereClauses.Count == 0 ?
                 string.Empty :
-                " where " + string.Join(" AND ", whereClauses.ToArray(whereClauses.Count));
+                " where " + string.Join(" AND ", whereClauses.ToArray());
 
             commandText += whereText;
 
@@ -3299,7 +3299,7 @@ namespace Emby.Server.Implementations.Data
 
             var whereText = whereClauses.Count == 0 ?
                 string.Empty :
-                " where " + string.Join(" AND ", whereClauses.ToArray(whereClauses.Count));
+                " where " + string.Join(" AND ", whereClauses.ToArray());
 
             commandText += whereText;
 
@@ -3372,11 +3372,11 @@ namespace Emby.Server.Implementations.Data
                 var returnList = GetItemIdsList(query);
                 return new QueryResult<Guid>
                 {
-                    Items = returnList.ToArray(returnList.Count),
+                    Items = returnList.ToArray(),
                     TotalRecordCount = returnList.Count
                 };
             }
-            //Logger.Info("GetItemIds: " + _environmentInfo.StackTrace);
+            //logger.LogInformation("GetItemIds: " + _environmentInfo.StackTrace);
 
             var now = DateTime.UtcNow;
 
@@ -3387,7 +3387,7 @@ namespace Emby.Server.Implementations.Data
 
             var whereText = whereClauses.Count == 0 ?
                 string.Empty :
-                " where " + string.Join(" AND ", whereClauses.ToArray(whereClauses.Count));
+                " where " + string.Join(" AND ", whereClauses.ToArray());
 
             var whereTextWithoutPaging = whereText;
 
@@ -3495,7 +3495,7 @@ namespace Emby.Server.Implementations.Data
 
                         LogQueryTime("GetItemIds", commandText, now);
 
-                        result.Items = list.ToArray(list.Count);
+                        result.Items = list.ToArray();
                         return result;
 
                     }, ReadTransactionMode);
@@ -3690,7 +3690,7 @@ namespace Emby.Server.Implementations.Data
                     statement.TryBind("@IsMovie", true);
                 }
 
-                whereClauses.Add("(" + string.Join(" OR ", programAttribtues.ToArray(programAttribtues.Count)) + ")");
+                whereClauses.Add("(" + string.Join(" OR ", programAttribtues.ToArray()) + ")");
             }
             else if (query.IsMovie.HasValue)
             {
@@ -5565,7 +5565,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
             }
 
             CheckDisposed();
-            //Logger.Info("GetItemValues: " + _environmentInfo.StackTrace);
+            //logger.LogInformation("GetItemValues: " + _environmentInfo.StackTrace);
 
             var now = DateTime.UtcNow;
 
@@ -5734,7 +5734,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
                         var list = new List<Tuple<BaseItem, ItemCounts>>();
                         var result = new QueryResult<Tuple<BaseItem, ItemCounts>>();
 
-                        //Logger.Info("GetItemValues {0}", string.Join(";", statementTexts.ToArray()));
+                        //logger.LogInformation("GetItemValues {0}", string.Join(";", statementTexts.ToArray()));
                         var statements = PrepareAllSafe(db, statementTexts);
 
                         if (!isReturningZeroItems)
@@ -5813,7 +5813,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
                         {
                             result.TotalRecordCount = list.Count;
                         }
-                        result.Items = list.ToArray(list.Count);
+                        result.Items = list.ToArray();
 
                         return result;