Merge pull request jellyfin#2916 from Bond-009/minor2

Minor improvements
sjww233 · Apr 20, 2020 · 3142c9b · 3142c9b
2 parents 1d4763a + a73e1f1
commit 3142c9b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -242,11 +242,11 @@ private QueryResult<BaseItem> GetQueryResult(GetItems request, DtoOptions dtoOpt
                 return folder.GetItems(GetItemsQuery(request, dtoOptions, user));
             }
 
-            var itemsArray = folder.GetChildren(user, true).ToArray();
+            var itemsArray = folder.GetChildren(user, true);
             return new QueryResult<BaseItem>
             {
                 Items = itemsArray,
-                TotalRecordCount = itemsArray.Length,
+                TotalRecordCount = itemsArray.Count,
                 StartIndex = 0
             };
         }

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -2741,7 +2741,7 @@ public string GetEtag(User user)
         {
             var list = GetEtagValues(user);
 
-            return string.Join("|", list.ToArray()).GetMD5().ToString("N", CultureInfo.InvariantCulture);
+            return string.Join("|", list).GetMD5().ToString("N", CultureInfo.InvariantCulture);
         }
 
         protected virtual List<string> GetEtagValues(User user)
@@ -2784,8 +2784,7 @@ public virtual bool IsTopParent
                     return true;
                 }
 
-                var view = this as IHasCollectionType;
-                if (view != null)
+                if (this is IHasCollectionType view)
                 {
                     if (string.Equals(view.CollectionType, CollectionType.LiveTv, StringComparison.OrdinalIgnoreCase))
                     {

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
@@ -864,7 +864,7 @@ public IReadOnlyList<BaseItem> GetItemList(InternalItemsQuery query)
                     return SortItemsByRequest(query, result);
                 }
 
-                return result.ToArray();
+                return result;
             }
 
             return GetItemsInternal(query).Items;

diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -478,7 +478,7 @@ private async Task<string> ExtractImage(string[] inputFiles, string container, M
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError(ex, "I-frame image extraction failed, will attempt standard way. Input: {arguments}", inputArgument);
+                    _logger.LogError(ex, "I-frame image extraction failed, will attempt standard way. Input: {Arguments}", inputArgument);
                 }
             }
 
@@ -969,7 +969,7 @@ public ProcessWrapper(Process process, MediaEncoder mediaEncoder)
 
             public int? ExitCode { get; private set; }
 
-            void OnProcessExited(object sender, EventArgs e)
+            private void OnProcessExited(object sender, EventArgs e)
             {
                 var process = (Process)sender;