Merge pull request #288 from Bond-009/toarray

Remove custom ToArray extension
This commit is contained in:
Andrew Rabert 2018-12-28 16:33:42 -05:00 committed by GitHub
commit 9c49e936f0
59 changed files with 137 additions and 178 deletions

View File

@ -467,7 +467,7 @@ namespace Emby.Dlna.ContentDirectory
IsMissing = false,
ExcludeItemTypes = new[] { typeof(Game).Name, typeof(Book).Name },
IsFolder = isFolder,
MediaTypes = mediaTypes.ToArray(mediaTypes.Count),
MediaTypes = mediaTypes.ToArray(),
DtoOptions = GetDtoOptions()
});
}
@ -676,7 +676,7 @@ namespace Emby.Dlna.ContentDirectory
return new QueryResult<ServerItem>
{
Items = list.ToArray(list.Count),
Items = list.ToArray(),
TotalRecordCount = list.Count
};
}
@ -754,7 +754,7 @@ namespace Emby.Dlna.ContentDirectory
return new QueryResult<ServerItem>
{
Items = list.ToArray(list.Count),
Items = list.ToArray(),
TotalRecordCount = list.Count
};
}
@ -859,7 +859,7 @@ namespace Emby.Dlna.ContentDirectory
return new QueryResult<ServerItem>
{
Items = list.ToArray(list.Count),
Items = list.ToArray(),
TotalRecordCount = list.Count
};
}
@ -1026,7 +1026,7 @@ namespace Emby.Dlna.ContentDirectory
var result = new QueryResult<BaseItem>
{
TotalRecordCount = genresResult.TotalRecordCount,
Items = genresResult.Items.Select(i => i.Item1).ToArray(genresResult.Items.Length)
Items = genresResult.Items.Select(i => i.Item1).ToArray()
};
return ToResult(result);
@ -1044,7 +1044,7 @@ namespace Emby.Dlna.ContentDirectory
var result = new QueryResult<BaseItem>
{
TotalRecordCount = genresResult.TotalRecordCount,
Items = genresResult.Items.Select(i => i.Item1).ToArray(genresResult.Items.Length)
Items = genresResult.Items.Select(i => i.Item1).ToArray()
};
return ToResult(result);
@ -1062,7 +1062,7 @@ namespace Emby.Dlna.ContentDirectory
var result = new QueryResult<BaseItem>
{
TotalRecordCount = artists.TotalRecordCount,
Items = artists.Items.Select(i => i.Item1).ToArray(artists.Items.Length)
Items = artists.Items.Select(i => i.Item1).ToArray()
};
return ToResult(result);
@ -1080,7 +1080,7 @@ namespace Emby.Dlna.ContentDirectory
var result = new QueryResult<BaseItem>
{
TotalRecordCount = artists.TotalRecordCount,
Items = artists.Items.Select(i => i.Item1).ToArray(artists.Items.Length)
Items = artists.Items.Select(i => i.Item1).ToArray()
};
return ToResult(result);
@ -1099,7 +1099,7 @@ namespace Emby.Dlna.ContentDirectory
var result = new QueryResult<BaseItem>
{
TotalRecordCount = artists.TotalRecordCount,
Items = artists.Items.Select(i => i.Item1).ToArray(artists.Items.Length)
Items = artists.Items.Select(i => i.Item1).ToArray()
};
return ToResult(result);
@ -1247,7 +1247,7 @@ namespace Emby.Dlna.ContentDirectory
{
var serverItems = result
.Select(i => new ServerItem(i))
.ToArray(result.Length);
.ToArray();
return new QueryResult<ServerItem>
{

View File

@ -512,7 +512,7 @@ namespace Emby.Dlna.Didl
streamInfo = new StreamBuilder(_mediaEncoder, GetStreamBuilderLogger(options)).BuildAudioItem(new AudioOptions
{
ItemId = audio.Id,
MediaSources = sources.ToArray(sources.Count),
MediaSources = sources.ToArray(),
Profile = _profile,
DeviceId = deviceId
});

View File

@ -941,7 +941,7 @@ namespace Emby.Dlna.PlayTo
if (room != null && !string.IsNullOrWhiteSpace(room.Value))
friendlyNames.Add(room.Value);
deviceProperties.Name = string.Join(" ", friendlyNames.ToArray(friendlyNames.Count));
deviceProperties.Name = string.Join(" ", friendlyNames.ToArray());
var model = document.Descendants(uPnpNamespaces.ud.GetName("modelName")).FirstOrDefault();
if (model != null)

View File

@ -571,7 +571,7 @@ namespace Emby.Dlna.PlayTo
StreamInfo = new StreamBuilder(_mediaEncoder, GetStreamBuilderLogger()).BuildAudioItem(new AudioOptions
{
ItemId = item.Id,
MediaSources = mediaSources.ToArray(mediaSources.Count),
MediaSources = mediaSources.ToArray(),
Profile = profile,
DeviceId = deviceId,
MaxBitrate = profile.MaxStreamingBitrate,

View File

@ -173,7 +173,7 @@ namespace Emby.Dlna.Profiles
Value = value
});
XmlRootAttributes = list.ToArray(list.Count);
XmlRootAttributes = list.ToArray();
}
}
}

View File

@ -242,7 +242,7 @@ namespace Emby.Dlna.Service
}
var originalHeaders = request.Headers;
var headers = string.Join(", ", originalHeaders.Select(i => string.Format("{0}={1}", i.Key, i.Value)).ToArray(originalHeaders.Count));
var headers = string.Join(", ", originalHeaders.Select(i => string.Format("{0}={1}", i.Key, i.Value)).ToArray());
Logger.Debug("Control request. Headers: {0}", headers);
}

View File

@ -564,7 +564,7 @@ namespace Emby.Drawing
var cacheKeys = imageEnhancers.Select(i => i.GetConfigurationCacheKey(item, imageType)).ToList();
cacheKeys.Add(originalImagePath + dateModified.Ticks);
return string.Join("|", cacheKeys.ToArray(cacheKeys.Count)).GetMD5().ToString("N");
return string.Join("|", cacheKeys.ToArray()).GetMD5().ToString("N");
}
private async Task<ValueTuple<string, DateTime>> GetSupportedImage(string originalImagePath, DateTime dateModified)
@ -919,4 +919,4 @@ namespace Emby.Drawing
}
}
}
}
}

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;
}

View File

@ -143,7 +143,7 @@ namespace MediaBrowser.Api
{
var list = options.Fields.ToList();
list.Add(Model.Querying.ItemFields.RecursiveItemCount);
options.Fields = list.ToArray(list.Count);
options.Fields = list.ToArray();
}
if (client.IndexOf("kodi", StringComparison.OrdinalIgnoreCase) != -1 ||
@ -156,7 +156,7 @@ namespace MediaBrowser.Api
{
var list = options.Fields.ToList();
list.Add(Model.Querying.ItemFields.ChildCount);
options.Fields = list.ToArray(list.Count);
options.Fields = list.ToArray();
}
}

View File

@ -974,7 +974,7 @@ namespace MediaBrowser.Api.LiveTv
fields.Remove(ItemFields.CanDownload);
fields.Remove(ItemFields.DisplayPreferencesId);
fields.Remove(ItemFields.Etag);
options.Fields = fields.ToArray(fields.Count);
options.Fields = fields.ToArray();
}
public object Get(GetChannel request)
@ -1265,4 +1265,4 @@ namespace MediaBrowser.Api.LiveTv
return _liveTvManager.ResetTuner(request.Id, CancellationToken.None);
}
}
}
}

View File

@ -123,7 +123,7 @@ namespace MediaBrowser.Api.Movies
var itemsResult = _libraryManager.GetItemList(new InternalItemsQuery(user)
{
Limit = request.Limit,
IncludeItemTypes = itemTypes.ToArray(itemTypes.Count),
IncludeItemTypes = itemTypes.ToArray(),
IsMovie = true,
SimilarTo = item,
EnableGroupByMetadataKey = true,
@ -177,12 +177,12 @@ namespace MediaBrowser.Api.Movies
var likedMovies = _libraryManager.GetItemList(new InternalItemsQuery(user)
{
IncludeItemTypes = itemTypes.ToArray(itemTypes.Count),
IncludeItemTypes = itemTypes.ToArray(),
IsMovie = true,
OrderBy = new[] { ItemSortBy.Random }.Select(i => new ValueTuple<string, SortOrder>(i, SortOrder.Descending)).ToArray(),
Limit = 10,
IsFavoriteOrLiked = true,
ExcludeItemIds = recentlyPlayedMovies.Select(i => i.Id).ToArray(recentlyPlayedMovies.Count),
ExcludeItemIds = recentlyPlayedMovies.Select(i => i.Id).ToArray(),
EnableGroupByMetadataKey = true,
ParentId = parentIdGuid,
Recursive = true,
@ -265,7 +265,7 @@ namespace MediaBrowser.Api.Movies
// Account for duplicates by imdb id, since the database doesn't support this yet
Limit = itemLimit + 2,
PersonTypes = new[] { PersonType.Director },
IncludeItemTypes = itemTypes.ToArray(itemTypes.Count),
IncludeItemTypes = itemTypes.ToArray(),
IsMovie = true,
EnableGroupByMetadataKey = true,
DtoOptions = dtoOptions
@ -305,7 +305,7 @@ namespace MediaBrowser.Api.Movies
Person = name,
// Account for duplicates by imdb id, since the database doesn't support this yet
Limit = itemLimit + 2,
IncludeItemTypes = itemTypes.ToArray(itemTypes.Count),
IncludeItemTypes = itemTypes.ToArray(),
IsMovie = true,
EnableGroupByMetadataKey = true,
DtoOptions = dtoOptions
@ -343,7 +343,7 @@ namespace MediaBrowser.Api.Movies
var similar = _libraryManager.GetItemList(new InternalItemsQuery(user)
{
Limit = itemLimit,
IncludeItemTypes = itemTypes.ToArray(itemTypes.Count),
IncludeItemTypes = itemTypes.ToArray(),
IsMovie = true,
SimilarTo = item,
EnableGroupByMetadataKey = true,

View File

@ -11,7 +11,6 @@ using System.Linq;
using System.Threading.Tasks;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Services;
using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Api
{
@ -81,7 +80,7 @@ namespace MediaBrowser.Api
var query = new InternalItemsQuery(user)
{
IncludeItemTypes = includeTypes.Select(i => i.Name).ToArray(includeTypes.Length),
IncludeItemTypes = includeTypes.Select(i => i.Name).ToArray(),
Recursive = true,
DtoOptions = dtoOptions
};

View File

@ -206,7 +206,7 @@ namespace MediaBrowser.Api.UserLibrary
return new QueryResult<BaseItemDto>
{
Items = dtos.ToArray(result.Items.Length),
Items = dtos.ToArray(),
TotalRecordCount = result.TotalRecordCount
};
}

View File

@ -93,7 +93,7 @@ namespace MediaBrowser.Api.UserLibrary
fields.Add(ItemFields.PrimaryImageAspectRatio);
fields.Add(ItemFields.DisplayPreferencesId);
fields.Remove(ItemFields.BasicSyncInfo);
dtoOptions.Fields = fields.ToArray(fields.Count);
dtoOptions.Fields = fields.ToArray();
var user = _userManager.GetUserById(request.UserId);

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)

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();

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();
}
}
}

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;
}
}

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();
}
}
}

View File

@ -6,7 +6,6 @@ using System.Collections.Generic;
using System.Xml;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Xml;
using MediaBrowser.Model.Extensions;
namespace MediaBrowser.LocalMetadata.Parsers
{
@ -85,7 +84,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
}
}
item.Item.LinkedChildren = list.ToArray(list.Count);
item.Item.LinkedChildren = list.ToArray();
}
public BoxSetXmlParser(ILogger logger, IProviderManager providerManager, IXmlReaderSettingsFactory xmlReaderSettingsFactory, IFileSystem fileSystem) : base(logger, providerManager, xmlReaderSettingsFactory, fileSystem)

View File

@ -95,7 +95,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
}
}
item.LinkedChildren = list.ToArray(list.Count);
item.LinkedChildren = list.ToArray();
}
public PlaylistXmlParser(ILogger logger, IProviderManager providerManager, IXmlReaderSettingsFactory xmlReaderSettingsFactory, IFileSystem fileSystem) : base(logger, providerManager, xmlReaderSettingsFactory, fileSystem)

View File

@ -101,7 +101,7 @@ namespace MediaBrowser.Model.Dlna
{
list.Add(MediaFormatProfile.MPEG_TS_JP_T);
}
return list.ToArray(list.Count);
return list.ToArray();
}
if (StringHelper.EqualsIgnoreCase(videoCodec, "h264"))
{

View File

@ -186,7 +186,7 @@ namespace MediaBrowser.Model.Dlna
list.Add(string.Format("{0}={1}", pair.Name, encodedValue));
}
string queryString = string.Join("&", list.ToArray(list.Count));
string queryString = string.Join("&", list.ToArray());
return GetUrl(baseUrl, queryString);
}

View File

@ -1,4 +1,5 @@
using System;
using System.Linq;
using System.Collections.Generic;
using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Extensions;
@ -104,7 +105,7 @@ namespace MediaBrowser.Model.Entities
attributes.Add("Default");
}
return string.Join(" ", attributes.ToArray(attributes.Count));
return string.Join(" ", attributes.ToArray());
}
if (Type == MediaStreamType.Video)
@ -123,7 +124,7 @@ namespace MediaBrowser.Model.Entities
attributes.Add(Codec.ToUpper());
}
return string.Join(" ", attributes.ToArray(attributes.Count));
return string.Join(" ", attributes.ToArray());
}
if (Type == MediaStreamType.Subtitle)
@ -154,7 +155,7 @@ namespace MediaBrowser.Model.Entities
attributes.Add("Forced");
}
string name = string.Join(" ", attributes.ToArray(attributes.Count));
string name = string.Join(" ", attributes.ToArray());
return name;
}

View File

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
// TODO: @bond Remove
namespace MediaBrowser.Model.Extensions
{
// MoreLINQ - Extensions to LINQ to Objects
@ -42,19 +43,6 @@ namespace MediaBrowser.Model.Extensions
return source.DistinctBy(keySelector, null);
}
public static TSource[] ToArray<TSource>(this IEnumerable<TSource> source, int count)
{
if (source == null) throw new ArgumentNullException("source");
if (count < 0) throw new ArgumentOutOfRangeException("count");
var array = new TSource[count];
int i = 0;
foreach (var item in source)
{
array[i++] = item;
}
return array;
}
/// <summary>
/// Returns all distinct elements of the given source, where "distinctness"
/// is determined via a projection and the specified comparer for the projected type.

View File

@ -2,8 +2,6 @@
using System.Collections;
using System.Collections.Generic;
using System.Text;
using MediaBrowser.Model.Services;
using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Model.Services
{
@ -586,7 +584,7 @@ namespace MediaBrowser.Model.Services
WriteCharBytes(bytes, ch, e);
}
byte[] buf = bytes.ToArray(bytes.Count);
byte[] buf = bytes.ToArray();
bytes = null;
return e.GetString(buf, 0, buf.Length);

View File

@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Model.Services
{
@ -221,7 +220,7 @@ namespace MediaBrowser.Model.Services
public override String ToString()
{
var vals = this.Select(GetQueryStringValue).ToArray(this.Count);
var vals = this.Select(GetQueryStringValue).ToArray();
return string.Join("&", vals);
}

View File

@ -551,7 +551,7 @@ namespace MediaBrowser.Providers.Manager
{
list.Add(Path.Combine(item.ContainingFolderPath, "extrathumbs", "thumb" + outputIndex.ToString(UsCulture) + extension));
}
return list.ToArray(list.Count);
return list.ToArray();
}
if (type == ImageType.Primary)

View File

@ -522,7 +522,7 @@ namespace MediaBrowser.Providers.Manager
Type = MetadataPluginType.SubtitleFetcher
}));
summary.Plugins = pluginList.ToArray(pluginList.Count);
summary.Plugins = pluginList.ToArray();
var supportedImageTypes = imageProviders.OfType<IRemoteImageProvider>()
.SelectMany(i => i.GetSupportedImages(dummy))
@ -1160,4 +1160,4 @@ namespace MediaBrowser.Providers.Manager
}
}
}
}
}

View File

@ -145,7 +145,7 @@ namespace MediaBrowser.Providers.Movies
movie.ProductionLocations = movieData
.production_countries
.Select(i => i.name)
.ToArray(movieData.production_countries.Count);
.ToArray();
}
movie.SetProviderId(MetadataProviders.Tmdb, movieData.id.ToString(_usCulture));

View File

@ -279,7 +279,7 @@ namespace MediaBrowser.Providers.Movies
languages.Add("en");
}
return string.Join(",", languages.ToArray(languages.Count));
return string.Join(",", languages.ToArray());
}
public static string NormalizeLanguage(string language)

View File

@ -17,7 +17,6 @@ using System.Threading.Tasks;
using System.Xml;
using MediaBrowser.Model.Serialization;
using MediaBrowser.Model.Xml;
using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Providers.Music
{
@ -846,4 +845,4 @@ namespace MediaBrowser.Providers.Music
public int throttleMs { get; set; }
}
}
}
}

View File

@ -236,7 +236,7 @@ namespace MediaBrowser.Providers.TV
if (seriesInfo.networks != null)
{
series.Studios = seriesInfo.networks.Select(i => i.name).ToArray(seriesInfo.networks.Count);
series.Studios = seriesInfo.networks.Select(i => i.name).ToArray();
}
if (seriesInfo.genres != null)

View File

@ -95,7 +95,7 @@ namespace Mono.Nat.Pmp
try
{
byte[] buffer = package.ToArray(package.Count);
byte[] buffer = package.ToArray();
int attempt = 0;
int delay = PmpConstants.RetryDelay;