ReSharper conform to 'var' settings

This commit is contained in:
Erwin de Haan
2019-01-13 21:37:13 +01:00
parent a36658f6f0
commit 65bd052f3e
199 changed files with 1063 additions and 1063 deletions

View File

@@ -132,7 +132,7 @@ namespace Priority_Queue
int parent = node.QueueIndex / 2;
while (parent >= 1)
{
TItem parentNode = _nodes[parent];
var parentNode = _nodes[parent];
if (HasHigherPriority(parentNode, node))
break;
@@ -163,7 +163,7 @@ namespace Priority_Queue
break;
}
TItem childLeft = _nodes[childLeftIndex];
var childLeft = _nodes[childLeftIndex];
if (HasHigherPriority(childLeft, newParent))
{
newParent = childLeft;
@@ -173,7 +173,7 @@ namespace Priority_Queue
int childRightIndex = childLeftIndex + 1;
if (childRightIndex <= _numNodes)
{
TItem childRight = _nodes[childRightIndex];
var childRight = _nodes[childRightIndex];
if (HasHigherPriority(childRight, newParent))
{
newParent = childRight;
@@ -234,7 +234,7 @@ namespace Priority_Queue
}
#endif
TItem returnMe = _nodes[1];
var returnMe = _nodes[1];
Remove(returnMe);
item = returnMe;
return true;
@@ -316,7 +316,7 @@ namespace Priority_Queue
{
//Bubble the updated node up or down as appropriate
int parentIndex = node.QueueIndex / 2;
TItem parentNode = _nodes[parentIndex];
var parentNode = _nodes[parentIndex];
if (parentIndex > 0 && HasHigherPriority(node, parentNode))
{
@@ -356,7 +356,7 @@ namespace Priority_Queue
}
//Swap the node with the last node
TItem formerLastNode = _nodes[_numNodes];
var formerLastNode = _nodes[_numNodes];
Swap(node, formerLastNode);
_nodes[_numNodes] = null;
_numNodes--;

View File

@@ -63,7 +63,7 @@ namespace MediaBrowser.Providers.Manager
/// <param name="imageIndex">Index of the image.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
/// <exception cref="System.ArgumentNullException">mimeType</exception>
/// <exception cref="ArgumentNullException">mimeType</exception>
public Task SaveImage(BaseItem item, Stream source, string mimeType, ImageType type, int? imageIndex, CancellationToken cancellationToken)
{
return SaveImage(item, source, mimeType, type, imageIndex, null, cancellationToken);
@@ -299,7 +299,7 @@ namespace MediaBrowser.Providers.Manager
/// <param name="type">The type.</param>
/// <param name="imageIndex">Index of the image.</param>
/// <returns>System.String.</returns>
/// <exception cref="System.ArgumentNullException">
/// <exception cref="ArgumentNullException">
/// imageIndex
/// or
/// imageIndex
@@ -316,7 +316,7 @@ namespace MediaBrowser.Providers.Manager
/// <param name="type">The type.</param>
/// <param name="imageIndex">Index of the image.</param>
/// <param name="path">The path.</param>
/// <exception cref="System.ArgumentNullException">imageIndex
/// <exception cref="ArgumentNullException">imageIndex
/// or
/// imageIndex</exception>
private void SetImagePath(BaseItem item, ImageType type, int? imageIndex, string path)
@@ -333,7 +333,7 @@ namespace MediaBrowser.Providers.Manager
/// <param name="mimeType">Type of the MIME.</param>
/// <param name="saveLocally">if set to <c>true</c> [save locally].</param>
/// <returns>System.String.</returns>
/// <exception cref="System.ArgumentNullException">
/// <exception cref="ArgumentNullException">
/// imageIndex
/// or
/// imageIndex
@@ -490,7 +490,7 @@ namespace MediaBrowser.Providers.Manager
/// <param name="imageIndex">Index of the image.</param>
/// <param name="mimeType">Type of the MIME.</param>
/// <returns>IEnumerable{System.String}.</returns>
/// <exception cref="System.ArgumentNullException">imageIndex</exception>
/// <exception cref="ArgumentNullException">imageIndex</exception>
private string[] GetCompatibleSavePaths(BaseItem item, ImageType type, int? imageIndex, string mimeType)
{
var season = item as Season;

View File

@@ -415,7 +415,7 @@ namespace MediaBrowser.Providers.Manager
var folder = item as Folder;
if (folder != null && folder.SupportsDateLastMediaAdded)
{
DateTime dateLastMediaAdded = DateTime.MinValue;
var dateLastMediaAdded = DateTime.MinValue;
var any = false;
foreach (var child in children)

View File

@@ -80,7 +80,7 @@ namespace Priority_Queue
throw new InvalidOperationException("Cannot call .First on an empty queue");
}
SimpleNode first = _queue.First;
var first = _queue.First;
return (first != null ? first.Data : default(TItem));
}
}
@@ -155,7 +155,7 @@ namespace Priority_Queue
{
lock (_queue)
{
SimpleNode node = new SimpleNode(item);
var node = new SimpleNode(item);
if (_queue.Count == _queue.MaxSize)
{
_queue.Resize(_queue.MaxSize * 2 + 1);
@@ -199,7 +199,7 @@ namespace Priority_Queue
{
try
{
SimpleNode updateMe = GetExistingNode(item);
var updateMe = GetExistingNode(item);
_queue.UpdatePriority(updateMe, priority);
}
catch (InvalidOperationException ex)
@@ -211,7 +211,7 @@ namespace Priority_Queue
public IEnumerator<TItem> GetEnumerator()
{
List<TItem> queueData = new List<TItem>();
var queueData = new List<TItem>();
lock (_queue)
{
//Copy to a separate list because we don't want to 'yield return' inside a lock

View File

@@ -140,7 +140,7 @@ namespace MediaBrowser.Providers.Movies
return _tmdbSettings;
}
using (HttpResponseInfo response = await GetMovieDbResponse(new HttpRequestOptions
using (var response = await GetMovieDbResponse(new HttpRequestOptions
{
Url = string.Format(TmdbConfigUrl, ApiKey),
CancellationToken = cancellationToken,
@@ -148,7 +148,7 @@ namespace MediaBrowser.Providers.Movies
}).ConfigureAwait(false))
{
using (Stream json = response.Content)
using (var json = response.Content)
{
_tmdbSettings = await _jsonSerializer.DeserializeFromStreamAsync<TmdbSettingsResult>(json).ConfigureAwait(false);

View File

@@ -16,7 +16,7 @@ namespace MediaBrowser.Providers.Music
protected override IList<BaseItem> GetChildrenForMetadataUpdates(MusicArtist item)
{
return item.IsAccessedByName ?
item.GetTaggedItems(new Controller.Entities.InternalItemsQuery
item.GetTaggedItems(new InternalItemsQuery
{
Recursive = true,
IsFolder = false

View File

@@ -50,7 +50,7 @@ namespace MediaBrowser.Providers.Omdb
if (!string.IsNullOrWhiteSpace(imdbId))
{
OmdbProvider.RootObject rootObject = await provider.GetRootObject(imdbId, cancellationToken).ConfigureAwait(false);
var rootObject = await provider.GetRootObject(imdbId, cancellationToken).ConfigureAwait(false);
if (!string.IsNullOrEmpty(rootObject.Poster))
{

View File

@@ -43,7 +43,7 @@ namespace MediaBrowser.Providers.Omdb
throw new ArgumentNullException(nameof(imdbId));
}
T item = itemResult.Item;
var item = itemResult.Item;
var result = await GetRootObject(imdbId, cancellationToken).ConfigureAwait(false);
@@ -113,7 +113,7 @@ namespace MediaBrowser.Providers.Omdb
throw new ArgumentNullException(nameof(seriesImdbId));
}
T item = itemResult.Item;
var item = itemResult.Item;
var seasonResult = await GetSeasonRootObject(seriesImdbId, seasonNumber, cancellationToken).ConfigureAwait(false);
@@ -220,7 +220,7 @@ namespace MediaBrowser.Providers.Omdb
string resultString;
using (Stream stream = _fileSystem.GetFileStream(path, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.Read))
using (var stream = _fileSystem.GetFileStream(path, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.Read))
{
using (var reader = new StreamReader(stream, new UTF8Encoding(false)))
{
@@ -239,7 +239,7 @@ namespace MediaBrowser.Providers.Omdb
string resultString;
using (Stream stream = _fileSystem.GetFileStream(path, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.Read))
using (var stream = _fileSystem.GetFileStream(path, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.Read))
{
using (var reader = new StreamReader(stream, new UTF8Encoding(false)))
{
@@ -394,7 +394,7 @@ namespace MediaBrowser.Providers.Omdb
private void ParseAdditionalMetadata<T>(MetadataResult<T> itemResult, RootObject result)
where T : BaseItem
{
T item = itemResult.Item;
var item = itemResult.Item;
var isConfiguredForEnglish = IsConfiguredForEnglish(item) || _configurationManager.Configuration.EnableNewOmdbSupport;

View File

@@ -265,7 +265,7 @@ namespace MediaBrowser.Providers.People
public class PersonSearchResult
{
/// <summary>
/// Gets or sets a value indicating whether this <see cref="MovieDbPersonProvider.PersonSearchResult" /> is adult.
/// Gets or sets a value indicating whether this <see cref="PersonSearchResult" /> is adult.
/// </summary>
/// <value><c>true</c> if adult; otherwise, <c>false</c>.</value>
public bool Adult { get; set; }
@@ -300,7 +300,7 @@ namespace MediaBrowser.Providers.People
/// Gets or sets the results.
/// </summary>
/// <value>The results.</value>
public List<MovieDbPersonProvider.PersonSearchResult> Results { get; set; }
public List<PersonSearchResult> Results { get; set; }
/// <summary>
/// Gets or sets the total_ pages.
/// </summary>

View File

@@ -131,7 +131,7 @@ namespace MediaBrowser.Providers.Playlists
private IEnumerable<LinkedChild> GetWplItems(Stream stream)
{
WplContent content = new WplContent();
var content = new WplContent();
var playlist = content.GetFromStream(stream);
return playlist.PlaylistEntries.Select(i => new LinkedChild

View File

@@ -245,7 +245,7 @@ namespace MediaBrowser.Providers.Subtitles
{
if (video.VideoType != VideoType.VideoFile)
{
return Task.FromResult<RemoteSubtitleInfo[]>(new RemoteSubtitleInfo[] { });
return Task.FromResult(new RemoteSubtitleInfo[] { });
}
VideoContentType mediaType;
@@ -261,7 +261,7 @@ namespace MediaBrowser.Providers.Subtitles
else
{
// These are the only supported types
return Task.FromResult<RemoteSubtitleInfo[]>(new RemoteSubtitleInfo[] { });
return Task.FromResult(new RemoteSubtitleInfo[] { });
}
var request = new SubtitleSearchRequest

View File

@@ -1118,7 +1118,7 @@ namespace MediaBrowser.Providers.TV
private void FetchDataFromSeriesNode(MetadataResult<Series> result, XmlReader reader, CancellationToken cancellationToken)
{
Series item = result.Item;
var item = result.Item;
reader.MoveToContent();
reader.Read();