alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-03 22:38:30 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Remove custom ToArray extension

Browse Source
This commit is contained in:
Bond_009
2018-12-28 16:48:26 +01:00
parent a86b71899e
commit 6e5d2aadaa
59 changed files with 137 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -1295,7 +1295,7 @@ namespace MediaBrowser.Controller.Entities
}
}
return string.Join("/", terms.ToArray(terms.Count));
return string.Join("/", terms.ToArray());
}
/// <summary>
@@ -1536,7 +1536,7 @@ namespace MediaBrowser.Controller.Entities
{
var newThemeVideos = LoadThemeVideos(fileSystemChildren, options.DirectoryService);
var newThemeVideoIds = newThemeVideos.Select(i => i.Id).ToArray(newThemeVideos.Length);
var newThemeVideoIds = newThemeVideos.Select(i => i.Id).ToArray();
var themeVideosChanged = !item.ThemeVideoIds.SequenceEqual(newThemeVideoIds);
@@ -1573,7 +1573,7 @@ namespace MediaBrowser.Controller.Entities
private async Task<bool> RefreshThemeSongs(BaseItem item, MetadataRefreshOptions options, List<FileSystemMetadata> fileSystemChildren, CancellationToken cancellationToken)
{
var newThemeSongs = LoadThemeSongs(fileSystemChildren, options.DirectoryService);
var newThemeSongIds = newThemeSongs.Select(i => i.Id).ToArray(newThemeSongs.Length);
var newThemeSongIds = newThemeSongs.Select(i => i.Id).ToArray();
var themeSongsChanged = !item.ThemeSongIds.SequenceEqual(newThemeSongIds);
@@ -2110,9 +2110,8 @@ namespace MediaBrowser.Controller.Entities
}
else
{
var list = current.ToArray(current.Length + 1);
list[list.Length - 1] = name;
Studios = list;
var list =
Studios = current.Concat(new [] { name }).ToArray();
}
}
}
@@ -2252,9 +2251,7 @@ namespace MediaBrowser.Controller.Entities
else
{
var currentCount = ImageInfos.Length;
var newList = ImageInfos.ToArray(currentCount + 1);
newList[currentCount] = image;
ImageInfos = newList;
ImageInfos = ImageInfos.Concat(new [] { image }) .ToArray();
}
}
@@ -2269,10 +2266,7 @@ namespace MediaBrowser.Controller.Entities
if (image == null)
{
var currentCount = ImageInfos.Length;
var newList = ImageInfos.ToArray(currentCount + 1);
newList[currentCount] = GetImageInfo(file, type);
ImageInfos = newList;
ImageInfos = ImageInfos.Concat(new [] { GetImageInfo(file, type) }) .ToArray();
}
else
{
@@ -2486,16 +2480,7 @@ namespace MediaBrowser.Controller.Entities
if (newImageList.Count > 0)
{
var currentCount = ImageInfos.Length;
var newList = ImageInfos.ToArray(currentCount + newImageList.Count);
foreach (var image in newImageList)
{
newList[currentCount] = GetImageInfo(image, imageType);
currentCount++;
}
ImageInfos = newList;
ImageInfos = ImageInfos.Concat(newImageList.Select(i => GetImageInfo(i, imageType))).ToArray();
}
return imageUpdated || newImageList.Count > 0;
@@ -2537,7 +2522,7 @@ namespace MediaBrowser.Controller.Entities
var extensions = new List<string> { ".nfo", ".xml", ".srt", ".vtt", ".sub", ".idx", ".txt", ".edl", ".bif", ".smi", ".ttml" };
extensions.AddRange(SupportedImageExtensions);
return FileSystem.GetFiles(FileSystem.GetDirectoryName(Path), extensions.ToArray(extensions.Count), false, false)
return FileSystem.GetFiles(FileSystem.GetDirectoryName(Path), extensions.ToArray(), false, false)
.Where(i => System.IO.Path.GetFileNameWithoutExtension(i.FullName).StartsWith(filename, StringComparison.OrdinalIgnoreCase))
.ToList();
}
@@ -2776,7 +2761,7 @@ namespace MediaBrowser.Controller.Entities
{
var list = GetEtagValues(user);
return string.Join("|", list.ToArray(list.Count)).GetMD5().ToString("N");
return string.Join("|", list.ToArray()).GetMD5().ToString("N");
}
protected virtual List<string> GetEtagValues(User user)

2
MediaBrowser.Controller/Entities/CollectionFolder.cs
View File

@@ -275,7 +275,7 @@ namespace MediaBrowser.Controller.Entities
var changed = !linkedChildren.SequenceEqual(LinkedChildren, new LinkedChildComparer(FileSystem));
LinkedChildren = linkedChildren.ToArray(linkedChildren.Count);
LinkedChildren = linkedChildren.ToArray();
var folderIds = PhysicalFolderIds;
var newFolderIds = physicalFolders.Select(i => i.Id).ToArray();

5
MediaBrowser.Controller/Entities/Extensions.cs
View File

@@ -35,10 +35,7 @@ namespace MediaBrowser.Controller.Entities
}
else
{
var list = item.RemoteTrailers.ToArray(item.RemoteTrailers.Length + 1);
list[list.Length - 1] = mediaUrl;
item.RemoteTrailers = list;
item.RemoteTrailers = item.RemoteTrailers.Concat(new [] { mediaUrl }).ToArray();
}
}
}

4
MediaBrowser.Controller/Entities/Folder.cs
View File

@@ -914,7 +914,7 @@ namespace MediaBrowser.Controller.Entities
// Try to preserve order
return result.OrderBy(i => ids.IndexOf(i.Id)).ToArray();
}
return result.ToArray(result.Count);
return result.ToArray();
}
return GetItemsInternal(query).Items;
@@ -1608,7 +1608,7 @@ namespace MediaBrowser.Controller.Entities
Logger.Info("Shortcut links have changed for {0}", Path);
newShortcutLinks.AddRange(LinkedChildren.Where(i => i.Type == LinkedChildType.Manual));
LinkedChildren = newShortcutLinks.ToArray(newShortcutLinks.Count);
LinkedChildren = newShortcutLinks.ToArray();
return true;
}
}

7
MediaBrowser.Controller/Entities/TagExtensions.cs
View File

@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Controller.Entities
{
@@ -24,10 +22,7 @@ namespace MediaBrowser.Controller.Entities
}
else
{
var list = current.ToArray(current.Length + 1);
list[list.Length - 1] = name;
item.Tags = list;
item.Tags = current.Concat(new [] { name }).ToArray();
}
}
}