Remove custom ToArray extension

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

View File

@@ -466,7 +466,7 @@ namespace Emby.Server.Implementations.Activity
{
Name = string.Format(_localization.GetLocalizedString("ScheduledTaskFailedWithName"), task.Name),
Type = NotificationType.TaskFailed.ToString(),
Overview = string.Join(Environment.NewLine, vals.ToArray(vals.Count)),
Overview = string.Join(Environment.NewLine, vals.ToArray()),
ShortOverview = runningTime,
Severity = LogSeverity.Error
});

View File

@@ -189,13 +189,13 @@ namespace Emby.Server.Implementations.Activity
var whereTextWithoutPaging = whereClauses.Count == 0 ?
string.Empty :
" where " + string.Join(" AND ", whereClauses.ToArray(whereClauses.Count));
" where " + string.Join(" AND ", whereClauses.ToArray());
if (startIndex.HasValue && startIndex.Value > 0)
{
var pagingWhereText = whereClauses.Count == 0 ?
string.Empty :
" where " + string.Join(" AND ", whereClauses.ToArray(whereClauses.Count));
" where " + string.Join(" AND ", whereClauses.ToArray());
whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM ActivityLog {0} ORDER BY DateCreated DESC LIMIT {1})",
pagingWhereText,
@@ -204,7 +204,7 @@ namespace Emby.Server.Implementations.Activity
var whereText = whereClauses.Count == 0 ?
string.Empty :
" where " + string.Join(" AND ", whereClauses.ToArray(whereClauses.Count));
" where " + string.Join(" AND ", whereClauses.ToArray());
commandText += whereText;
@@ -249,7 +249,7 @@ namespace Emby.Server.Implementations.Activity
result.TotalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
}
result.Items = list.ToArray(list.Count);
result.Items = list.ToArray();
return result;
}, ReadTransactionMode);

View File

@@ -728,7 +728,7 @@ namespace Emby.Server.Implementations
Logger.Info("ServerId: {0}", SystemId);
var entryPoints = GetExports<IServerEntryPoint>().ToList();
var entryPoints = GetExports<IServerEntryPoint>();
RunEntryPoints(entryPoints, true);
Logger.Info("Core startup complete");

View File

@@ -239,7 +239,7 @@ namespace Emby.Server.Implementations.Channels
all = all.Take(query.Limit.Value).ToList();
}
var returnItems = all.ToArray(all.Count);
var returnItems = all.ToArray();
if (query.RefreshLatestChannelItems)
{
@@ -1011,7 +1011,7 @@ namespace Emby.Server.Implementations.Channels
{
item.Name = info.Name;
item.Genres = info.Genres.ToArray();
item.Studios = info.Studios.ToArray(info.Studios.Count);
item.Studios = info.Studios.ToArray();
item.CommunityRating = info.CommunityRating;
item.Overview = info.Overview;
item.IndexNumber = info.IndexNumber;
@@ -1021,7 +1021,7 @@ namespace Emby.Server.Implementations.Channels
item.ProviderIds = info.ProviderIds;
item.OfficialRating = info.OfficialRating;
item.DateCreated = info.DateCreated ?? DateTime.UtcNow;
item.Tags = info.Tags.ToArray(info.Tags.Count);
item.Tags = info.Tags.ToArray();
item.OriginalTitle = info.OriginalTitle;
}
else if (info.Type == ChannelItemType.Folder && info.FolderType == ChannelFolderType.Container)
@@ -1043,7 +1043,7 @@ namespace Emby.Server.Implementations.Channels
var hasAlbumArtists = item as IHasAlbumArtist;
if (hasAlbumArtists != null)
{
hasAlbumArtists.AlbumArtists = info.AlbumArtists.ToArray(info.AlbumArtists.Count);
hasAlbumArtists.AlbumArtists = info.AlbumArtists.ToArray();
}
var trailer = item as Trailer;

View File

@@ -219,7 +219,7 @@ namespace Emby.Server.Implementations.Collections
{
var newList = collection.LinkedChildren.ToList();
newList.AddRange(list);
collection.LinkedChildren = newList.ToArray(newList.Count);
collection.LinkedChildren = newList.ToArray();
collection.UpdateRatingToItems(linkedChildrenList);

View File

@@ -1148,7 +1148,7 @@ namespace Emby.Server.Implementations.Data
}
}
item.ImageInfos = list.ToArray(list.Count);
item.ImageInfos = list.ToArray();
}
public string ToValueString(ItemImageInfo image)
@@ -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;
@@ -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;
@@ -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;
@@ -2938,7 +2938,7 @@ namespace Emby.Server.Implementations.Data
var returnList = GetItemList(query);
return new QueryResult<BaseItem>
{
Items = returnList.ToArray(returnList.Count),
Items = returnList.ToArray(),
TotalRecordCount = returnList.Count
};
}
@@ -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);
@@ -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,7 +3372,7 @@ namespace Emby.Server.Implementations.Data
var returnList = GetItemIdsList(query);
return new QueryResult<Guid>
{
Items = returnList.ToArray(returnList.Count),
Items = returnList.ToArray(),
TotalRecordCount = returnList.Count
};
}
@@ -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)
{
@@ -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;

View File

@@ -289,7 +289,7 @@ namespace Emby.Server.Implementations.Devices
var list = history.FilesUploaded.ToList();
list.Add(file);
history.FilesUploaded = list.ToArray(list.Count);
history.FilesUploaded = list.ToArray();
_json.SerializeToFile(history, path);
}
@@ -501,4 +501,4 @@ namespace Emby.Server.Implementations.Devices
return config.GetConfiguration<DevicesOptions>("devices");
}
}
}
}

View File

@@ -648,7 +648,7 @@ namespace Emby.Server.Implementations.Dto
}
}
dto.People = list.ToArray(list.Count);
dto.People = list.ToArray();
}
/// <summary>

View File

@@ -12,7 +12,6 @@ using MediaBrowser.Model.Events;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Threading;
using Mono.Nat;
using MediaBrowser.Model.Extensions;
using System.Threading;
namespace Emby.Server.Implementations.EntryPoints
@@ -59,7 +58,7 @@ namespace Emby.Server.Implementations.EntryPoints
values.Add(_appHost.EnableHttps.ToString());
values.Add((config.EnableRemoteAccess).ToString());
return string.Join("|", values.ToArray(values.Count));
return string.Join("|", values.ToArray());
}
void _config_ConfigurationUpdated(object sender, EventArgs e)
@@ -316,4 +315,4 @@ namespace Emby.Server.Implementations.EntryPoints
}
}
}
}
}

View File

@@ -58,7 +58,7 @@ namespace Emby.Server.Implementations.EntryPoints
session.ApplicationVersion
};
var key = string.Join("_", keys.ToArray(keys.Count)).GetMD5();
var key = string.Join("_", keys.ToArray()).GetMD5();
ClientInfo info;
if (!_apps.TryGetValue(key, out info))

View File

@@ -825,7 +825,7 @@ namespace Emby.Server.Implementations.HttpServer
});
}
return routes.ToArray(routes.Count);
return routes.ToArray();
}
public Func<string, object> GetParseFn(Type propertyType)
@@ -954,4 +954,4 @@ namespace Emby.Server.Implementations.HttpServer
_listener.Start(UrlPrefixes);
}
}
}
}

View File

@@ -2,6 +2,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
// TODO: @bond Remove
namespace SharpCifs.Util.Sharpen
{
internal static class Collections<T>

View File

@@ -1493,7 +1493,7 @@ namespace Emby.Server.Implementations.Library
return new QueryResult<BaseItem>
{
Items = list.ToArray(list.Count)
Items = list.ToArray()
};
}

View File

@@ -161,8 +161,8 @@ namespace Emby.Server.Implementations.Library
var searchQuery = new InternalItemsQuery(user)
{
SearchTerm = searchTerm,
ExcludeItemTypes = excludeItemTypes.ToArray(excludeItemTypes.Count),
IncludeItemTypes = includeItemTypes.ToArray(includeItemTypes.Count),
ExcludeItemTypes = excludeItemTypes.ToArray(),
IncludeItemTypes = includeItemTypes.ToArray(),
Limit = query.Limit,
IncludeItemsByName = string.IsNullOrEmpty(query.ParentId),
ParentId = string.IsNullOrEmpty(query.ParentId) ? Guid.Empty : new Guid(query.ParentId),

View File

@@ -354,7 +354,7 @@ namespace Emby.Server.Implementations.Library
Limit = limit * 5,
IsPlayed = isPlayed,
DtoOptions = options,
MediaTypes = mediaTypes.ToArray(mediaTypes.Count)
MediaTypes = mediaTypes.ToArray()
};
if (parents.Count == 0)

View File

@@ -139,7 +139,7 @@ namespace Emby.Server.Implementations.LiveTv
dto.ProgramId = GetInternalProgramId(info.ProgramId).ToString("N");
}
dto.DayPattern = info.Days == null ? null : GetDayPattern(info.Days.ToArray(info.Days.Count));
dto.DayPattern = info.Days == null ? null : GetDayPattern(info.Days.ToArray());
FillImages(dto, info.Name, info.SeriesId);

View File

@@ -1140,7 +1140,7 @@ namespace Emby.Server.Implementations.LiveTv
var dtoOptions = new DtoOptions();
var fields = dtoOptions.Fields.ToList();
fields.Remove(ItemFields.BasicSyncInfo);
dtoOptions.Fields = fields.ToArray(fields.Count);
dtoOptions.Fields = fields.ToArray();
progress.Report(100);
}
@@ -1458,16 +1458,16 @@ namespace Emby.Server.Implementations.LiveTv
{
MediaTypes = new[] { MediaType.Video },
Recursive = true,
AncestorIds = folderIds.ToArray(folderIds.Count),
AncestorIds = folderIds.ToArray(),
IsFolder = false,
IsVirtualItem = false,
Limit = limit,
StartIndex = query.StartIndex,
OrderBy = new[] { new ValueTuple<string, SortOrder>(ItemSortBy.DateCreated, SortOrder.Descending) },
EnableTotalRecordCount = query.EnableTotalRecordCount,
IncludeItemTypes = includeItemTypes.ToArray(includeItemTypes.Count),
ExcludeItemTypes = excludeItemTypes.ToArray(excludeItemTypes.Count),
Genres = genres.ToArray(genres.Count),
IncludeItemTypes = includeItemTypes.ToArray(),
ExcludeItemTypes = excludeItemTypes.ToArray(),
Genres = genres.ToArray(),
DtoOptions = dtoOptions
});
@@ -1791,7 +1791,7 @@ namespace Emby.Server.Implementations.LiveTv
var returnArray = returnList
.OrderBy(i => i.StartDate)
.ToArray(returnList.Count);
.ToArray();
return new QueryResult<TimerInfoDto>
{
@@ -2338,7 +2338,7 @@ namespace Emby.Server.Implementations.LiveTv
fields.Remove(ItemFields.CanDownload);
fields.Remove(ItemFields.DisplayPreferencesId);
fields.Remove(ItemFields.Etag);
options.Fields = fields.ToArray(fields.Count);
options.Fields = fields.ToArray();
}
public Folder GetInternalLiveTvFolder(CancellationToken cancellationToken)
@@ -2373,7 +2373,7 @@ namespace Emby.Server.Implementations.LiveTv
{
info.Id = Guid.NewGuid().ToString("N");
list.Add(info);
config.TunerHosts = list.ToArray(list.Count);
config.TunerHosts = list.ToArray();
}
else
{
@@ -2412,7 +2412,7 @@ namespace Emby.Server.Implementations.LiveTv
{
info.Id = Guid.NewGuid().ToString("N");
list.Add(info);
config.ListingProviders = list.ToArray(list.Count);
config.ListingProviders = list.ToArray();
}
else
{
@@ -2451,7 +2451,7 @@ namespace Emby.Server.Implementations.LiveTv
Name = tunerChannelId,
Value = providerChannelId
});
listingsProviderInfo.ChannelMappings = list.ToArray(list.Count);
listingsProviderInfo.ChannelMappings = list.ToArray();
}
_config.SaveConfiguration("livetv", config);
@@ -2602,4 +2602,4 @@ namespace Emby.Server.Implementations.LiveTv
return folders.Cast<BaseItem>().ToList();
}
}
}
}

View File

@@ -106,7 +106,7 @@ namespace Emby.Server.Implementations.LiveTv
openKeys.Add(item.GetType().Name);
openKeys.Add(item.Id.ToString("N"));
openKeys.Add(source.Id ?? string.Empty);
source.OpenToken = string.Join(StreamIdDelimeterString, openKeys.ToArray(openKeys.Count));
source.OpenToken = string.Join(StreamIdDelimeterString, openKeys.ToArray());
}
// Dummy this up so that direct play checks can still run

View File

@@ -706,7 +706,7 @@ namespace Emby.Server.Implementations.Networking
public async Task<IpAddressInfo[]> GetHostAddressesAsync(string host)
{
var addresses = await Dns.GetHostAddressesAsync(host).ConfigureAwait(false);
return addresses.Select(ToIpAddressInfo).ToArray(addresses.Length);
return addresses.Select(ToIpAddressInfo).ToArray();
}
/// <summary>

View File

@@ -208,7 +208,7 @@ namespace Emby.Server.Implementations.Playlists
var newList = playlist.LinkedChildren.ToList();
newList.AddRange(list);
playlist.LinkedChildren = newList.ToArray(newList.Count);
playlist.LinkedChildren = newList.ToArray();
playlist.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None);
@@ -290,7 +290,7 @@ namespace Emby.Server.Implementations.Playlists
newList.Insert(newIndex, item);
}
playlist.LinkedChildren = newList.ToArray(newList.Count);
playlist.LinkedChildren = newList.ToArray();
playlist.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None);

View File

@@ -145,7 +145,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
_fileSystem.CreateDirectory(parentPath);
_fileSystem.WriteAllText(failHistoryPath, string.Join("|", previouslyFailedImages.ToArray(previouslyFailedImages.Count)));
_fileSystem.WriteAllText(failHistoryPath, string.Join("|", previouslyFailedImages.ToArray()));
}
numComplete++;

View File

@@ -9,7 +9,6 @@ using MediaBrowser.Common.Events;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.Progress;
using MediaBrowser.Model.Events;
using MediaBrowser.Model.Extensions;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Serialization;
@@ -276,7 +275,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
get
{
var triggers = InternalTriggers;
return triggers.Select(i => i.Item1).ToArray(triggers.Length);
return triggers.Select(i => i.Item1).ToArray();
}
set
{
@@ -290,7 +289,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
SaveTriggers(triggerList);
InternalTriggers = triggerList.Select(i => new Tuple<TaskTriggerInfo, ITaskTrigger>(i, GetTrigger(i))).ToArray(triggerList.Length);
InternalTriggers = triggerList.Select(i => new Tuple<TaskTriggerInfo, ITaskTrigger>(i, GetTrigger(i))).ToArray();
}
}

View File

@@ -241,7 +241,7 @@ namespace Emby.Server.Implementations.Security
var whereTextWithoutPaging = whereClauses.Count == 0 ?
string.Empty :
" where " + string.Join(" AND ", whereClauses.ToArray(whereClauses.Count));
" where " + string.Join(" AND ", whereClauses.ToArray());
commandText += whereTextWithoutPaging;
@@ -298,7 +298,7 @@ namespace Emby.Server.Implementations.Security
}
}
result.Items = list.ToArray(list.Count);
result.Items = list.ToArray();
return result;
}, ReadTransactionMode);

View File

@@ -181,7 +181,7 @@ namespace Emby.Server.Implementations.Services
}
if (reqFilters.Count > 0)
actionCtx.RequestFilters = reqFilters.OrderBy(i => i.Priority).ToArray(reqFilters.Count);
actionCtx.RequestFilters = reqFilters.OrderBy(i => i.Priority).ToArray();
actions.Add(actionCtx);
}
@@ -220,4 +220,4 @@ namespace Emby.Server.Implementations.Services
}
}
}
}
}

View File

@@ -132,13 +132,13 @@ namespace Emby.Server.Implementations.Services
}
}
var components = componentsList.ToArray(componentsList.Count);
var components = componentsList.ToArray();
this.TotalComponentsCount = components.Length;
this.literalsToMatch = new string[this.TotalComponentsCount];
this.variablesNames = new string[this.TotalComponentsCount];
this.isWildcard = new bool[this.TotalComponentsCount];
this.componentsWithSeparators = hasSeparators.ToArray(hasSeparators.Count);
this.componentsWithSeparators = hasSeparators.ToArray();
this.PathComponentsCount = this.componentsWithSeparators.Length;
string firstLiteralMatch = null;
@@ -297,7 +297,7 @@ namespace Emby.Server.Implementations.Services
if (mi != null && mi.IsStatic) continue;
pis.Add(pi);
}
return pis.ToArray(pis.Count);
return pis.ToArray();
}
/// <summary>
@@ -463,7 +463,7 @@ namespace Emby.Server.Implementations.Services
}
}
withPathInfoParts = totalComponents.ToArray(totalComponents.Count);
withPathInfoParts = totalComponents.ToArray();
return true;
}
@@ -574,4 +574,4 @@ namespace Emby.Server.Implementations.Services
}
}
}
}
}

View File

@@ -1042,7 +1042,7 @@ namespace Emby.Server.Implementations.Session
command.PlayCommand = PlayCommand.PlayNow;
}
command.ItemIds = items.Select(i => i.Id).ToArray(items.Count);
command.ItemIds = items.Select(i => i.Id).ToArray();
if (user != null)
{
@@ -1070,7 +1070,7 @@ namespace Emby.Server.Implementations.Session
if (episodes.Count > 0)
{
command.ItemIds = episodes.Select(i => i.Id).ToArray(episodes.Count);
command.ItemIds = episodes.Select(i => i.Id).ToArray();
}
}
}
@@ -1316,7 +1316,7 @@ namespace Emby.Server.Implementations.Session
UserName = user.Name
});
session.AdditionalUsers = list.ToArray(list.Count);
session.AdditionalUsers = list.ToArray();
}
}
@@ -1345,7 +1345,7 @@ namespace Emby.Server.Implementations.Session
var list = session.AdditionalUsers.ToList();
list.Remove(user);
session.AdditionalUsers = list.ToArray(list.Count);
session.AdditionalUsers = list.ToArray();
}
}
@@ -1669,7 +1669,7 @@ namespace Emby.Server.Implementations.Session
fields.Remove(ItemFields.Tags);
fields.Remove(ItemFields.ExtraIds);
dtoOptions.Fields = fields.ToArray(fields.Count);
dtoOptions.Fields = fields.ToArray();
_itemInfoDtoOptions = dtoOptions;
}