mirror of
https://github.com/Prowlarr/Prowlarr.git
synced 2025-09-17 17:14:18 +02:00
Inline 'out' variable declarations
(cherry picked from commit 281add47de1d3940990156c841362125dea9cc7d)
This commit is contained in:
@@ -47,8 +47,7 @@ namespace NzbDrone.Common.Cache
|
||||
|
||||
public T Find(string key)
|
||||
{
|
||||
CacheItem cacheItem;
|
||||
if (!_store.TryGetValue(key, out cacheItem))
|
||||
if (!_store.TryGetValue(key, out var cacheItem))
|
||||
{
|
||||
return default(T);
|
||||
}
|
||||
@@ -76,8 +75,7 @@ namespace NzbDrone.Common.Cache
|
||||
|
||||
public void Remove(string key)
|
||||
{
|
||||
CacheItem value;
|
||||
_store.TryRemove(key, out value);
|
||||
_store.TryRemove(key, out _);
|
||||
}
|
||||
|
||||
public int Count => _store.Count;
|
||||
@@ -88,9 +86,7 @@ namespace NzbDrone.Common.Cache
|
||||
|
||||
lifeTime = lifeTime ?? _defaultLifeTime;
|
||||
|
||||
CacheItem cacheItem;
|
||||
|
||||
if (_store.TryGetValue(key, out cacheItem) && !cacheItem.IsExpired())
|
||||
if (_store.TryGetValue(key, out var cacheItem) && !cacheItem.IsExpired())
|
||||
{
|
||||
if (_rollingExpiry && lifeTime.HasValue)
|
||||
{
|
||||
|
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
@@ -86,9 +86,7 @@ namespace NzbDrone.Common.Cache
|
||||
{
|
||||
RefreshIfExpired();
|
||||
|
||||
TValue result;
|
||||
|
||||
if (!_items.TryGetValue(key, out result))
|
||||
if (!_items.TryGetValue(key, out var result))
|
||||
{
|
||||
throw new KeyNotFoundException(string.Format("Item {0} not found in cache.", key));
|
||||
}
|
||||
@@ -100,9 +98,7 @@ namespace NzbDrone.Common.Cache
|
||||
{
|
||||
RefreshIfExpired();
|
||||
|
||||
TValue result;
|
||||
|
||||
_items.TryGetValue(key, out result);
|
||||
_items.TryGetValue(key, out var result);
|
||||
|
||||
return result;
|
||||
}
|
||||
@@ -128,8 +124,7 @@ namespace NzbDrone.Common.Cache
|
||||
|
||||
public void Remove(string key)
|
||||
{
|
||||
TValue item;
|
||||
_items.TryRemove(key, out item);
|
||||
_items.TryRemove(key, out _);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -6,9 +6,7 @@ namespace NzbDrone.Common.Extensions
|
||||
{
|
||||
public static int? ParseInt32(this string source)
|
||||
{
|
||||
int result;
|
||||
|
||||
if (int.TryParse(source, out result))
|
||||
if (int.TryParse(source, out var result))
|
||||
{
|
||||
return result;
|
||||
}
|
||||
@@ -18,9 +16,7 @@ namespace NzbDrone.Common.Extensions
|
||||
|
||||
public static long? ParseInt64(this string source)
|
||||
{
|
||||
long result;
|
||||
|
||||
if (long.TryParse(source, out result))
|
||||
if (long.TryParse(source, out var result))
|
||||
{
|
||||
return result;
|
||||
}
|
||||
@@ -30,9 +26,7 @@ namespace NzbDrone.Common.Extensions
|
||||
|
||||
public static double? ParseDouble(this string source)
|
||||
{
|
||||
double result;
|
||||
|
||||
if (double.TryParse(source.Replace(',', '.'), NumberStyles.Number, CultureInfo.InvariantCulture, out result))
|
||||
if (double.TryParse(source.Replace(',', '.'), NumberStyles.Number, CultureInfo.InvariantCulture, out var result))
|
||||
{
|
||||
return result;
|
||||
}
|
||||
|
@@ -48,8 +48,7 @@ namespace NzbDrone.Core.Applications
|
||||
|
||||
foreach (var application in applications)
|
||||
{
|
||||
ApplicationStatus blockedApplicationStatus;
|
||||
if (blockedApplications.TryGetValue(application.Definition.Id, out blockedApplicationStatus))
|
||||
if (blockedApplications.TryGetValue(application.Definition.Id, out var blockedApplicationStatus))
|
||||
{
|
||||
_logger.Debug("Temporarily ignoring application {0} till {1} due to recent failures.", application.Definition.Name, blockedApplicationStatus.DisabledTill.Value.ToLocalTime());
|
||||
continue;
|
||||
|
@@ -121,8 +121,7 @@ namespace NzbDrone.Core.Configuration
|
||||
continue;
|
||||
}
|
||||
|
||||
object currentValue;
|
||||
allWithDefaults.TryGetValue(configValue.Key, out currentValue);
|
||||
allWithDefaults.TryGetValue(configValue.Key, out var currentValue);
|
||||
if (currentValue == null)
|
||||
{
|
||||
continue;
|
||||
|
@@ -53,8 +53,7 @@ namespace NzbDrone.Core.Configuration
|
||||
|
||||
foreach (var configValue in configValues)
|
||||
{
|
||||
object currentValue;
|
||||
allWithDefaults.TryGetValue(configValue.Key, out currentValue);
|
||||
allWithDefaults.TryGetValue(configValue.Key, out var currentValue);
|
||||
if (currentValue == null || configValue.Value == null)
|
||||
{
|
||||
continue;
|
||||
@@ -211,9 +210,7 @@ namespace NzbDrone.Core.Configuration
|
||||
|
||||
EnsureCache();
|
||||
|
||||
string dbValue;
|
||||
|
||||
if (_cache.TryGetValue(key, out dbValue) && dbValue != null && !string.IsNullOrEmpty(dbValue))
|
||||
if (_cache.TryGetValue(key, out var dbValue) && dbValue != null && !string.IsNullOrEmpty(dbValue))
|
||||
{
|
||||
return dbValue;
|
||||
}
|
||||
|
@@ -130,9 +130,8 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
|
||||
protected long GetRemainingSize(DownloadStationTask torrent)
|
||||
{
|
||||
var downloadedString = torrent.Additional.Transfer["size_downloaded"];
|
||||
long downloadedSize;
|
||||
|
||||
if (downloadedString.IsNullOrWhiteSpace() || !long.TryParse(downloadedString, out downloadedSize))
|
||||
if (downloadedString.IsNullOrWhiteSpace() || !long.TryParse(downloadedString, out var downloadedSize))
|
||||
{
|
||||
_logger.Debug("Torrent {0} has invalid size_downloaded: {1}", torrent.Title, downloadedString);
|
||||
downloadedSize = 0;
|
||||
@@ -144,9 +143,8 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
|
||||
protected TimeSpan? GetRemainingTime(DownloadStationTask torrent)
|
||||
{
|
||||
var speedString = torrent.Additional.Transfer["speed_download"];
|
||||
long downloadSpeed;
|
||||
|
||||
if (speedString.IsNullOrWhiteSpace() || !long.TryParse(speedString, out downloadSpeed))
|
||||
if (speedString.IsNullOrWhiteSpace() || !long.TryParse(speedString, out var downloadSpeed))
|
||||
{
|
||||
_logger.Debug("Torrent {0} has invalid speed_download: {1}", torrent.Title, speedString);
|
||||
downloadSpeed = 0;
|
||||
|
@@ -211,9 +211,8 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
|
||||
protected long GetRemainingSize(DownloadStationTask task)
|
||||
{
|
||||
var downloadedString = task.Additional.Transfer["size_downloaded"];
|
||||
long downloadedSize;
|
||||
|
||||
if (downloadedString.IsNullOrWhiteSpace() || !long.TryParse(downloadedString, out downloadedSize))
|
||||
if (downloadedString.IsNullOrWhiteSpace() || !long.TryParse(downloadedString, out var downloadedSize))
|
||||
{
|
||||
_logger.Debug("Task {0} has invalid size_downloaded: {1}", task.Title, downloadedString);
|
||||
downloadedSize = 0;
|
||||
@@ -225,9 +224,8 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
|
||||
protected long GetDownloadSpeed(DownloadStationTask task)
|
||||
{
|
||||
var speedString = task.Additional.Transfer["speed_download"];
|
||||
long downloadSpeed;
|
||||
|
||||
if (speedString.IsNullOrWhiteSpace() || !long.TryParse(speedString, out downloadSpeed))
|
||||
if (speedString.IsNullOrWhiteSpace() || !long.TryParse(speedString, out var downloadSpeed))
|
||||
{
|
||||
_logger.Debug("Task {0} has invalid speed_download: {1}", task.Title, speedString);
|
||||
downloadSpeed = 0;
|
||||
|
@@ -15,8 +15,7 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex.JsonConverters
|
||||
{
|
||||
var result = reader.Value.ToString().Replace("_", string.Empty);
|
||||
|
||||
NzbVortexLoginResultType output;
|
||||
Enum.TryParse(result, true, out output);
|
||||
Enum.TryParse(result, true, out NzbVortexLoginResultType output);
|
||||
|
||||
return output;
|
||||
}
|
||||
|
@@ -15,8 +15,7 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex.JsonConverters
|
||||
{
|
||||
var result = reader.Value.ToString().Replace("_", string.Empty);
|
||||
|
||||
NzbVortexResultType output;
|
||||
Enum.TryParse(result, true, out output);
|
||||
Enum.TryParse(result, true, out NzbVortexResultType output);
|
||||
|
||||
return output;
|
||||
}
|
||||
|
@@ -169,8 +169,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
|
||||
var config = _proxy.GetConfig(Settings);
|
||||
|
||||
var keepHistory = config.GetValueOrDefault("KeepHistory", "7");
|
||||
int value;
|
||||
if (!int.TryParse(keepHistory, NumberStyles.None, CultureInfo.InvariantCulture, out value) || value == 0)
|
||||
if (!int.TryParse(keepHistory, NumberStyles.None, CultureInfo.InvariantCulture, out var value) || value == 0)
|
||||
{
|
||||
return new NzbDroneValidationFailure(string.Empty, "NzbGet setting KeepHistory should be greater than 0")
|
||||
{
|
||||
|
@@ -177,11 +177,10 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
|
||||
var queue = GetQueue(settings);
|
||||
var history = GetHistory(settings);
|
||||
|
||||
int nzbId;
|
||||
NzbgetQueueItem queueItem;
|
||||
NzbgetHistoryItem historyItem;
|
||||
|
||||
if (id.Length < 10 && int.TryParse(id, out nzbId))
|
||||
if (id.Length < 10 && int.TryParse(id, out var nzbId))
|
||||
{
|
||||
// Download wasn't grabbed by Prowlarr, so the id is the NzbId reported by nzbget.
|
||||
queueItem = queue.SingleOrDefault(h => h.NzbId == nzbId);
|
||||
|
@@ -15,8 +15,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd.JsonConverters
|
||||
{
|
||||
var queuePriority = reader.Value.ToString();
|
||||
|
||||
SabnzbdPriority output;
|
||||
Enum.TryParse(queuePriority, out output);
|
||||
Enum.TryParse(queuePriority, out SabnzbdPriority output);
|
||||
|
||||
return output;
|
||||
}
|
||||
|
@@ -52,9 +52,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
|
||||
|
||||
request.AddFormUpload("name", filename, nzbData, "application/x-nzb");
|
||||
|
||||
SabnzbdAddResponse response;
|
||||
|
||||
if (!Json.TryDeserialize<SabnzbdAddResponse>(ProcessRequest(request, settings), out response))
|
||||
if (!Json.TryDeserialize<SabnzbdAddResponse>(ProcessRequest(request, settings), out var response))
|
||||
{
|
||||
response = new SabnzbdAddResponse();
|
||||
response.Status = true;
|
||||
@@ -71,9 +69,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
|
||||
request.AddQueryParam("cat", category);
|
||||
request.AddQueryParam("priority", priority);
|
||||
|
||||
SabnzbdAddResponse response;
|
||||
|
||||
if (!Json.TryDeserialize<SabnzbdAddResponse>(ProcessRequest(request, settings), out response))
|
||||
if (!Json.TryDeserialize<SabnzbdAddResponse>(ProcessRequest(request, settings), out var response))
|
||||
{
|
||||
response = new SabnzbdAddResponse();
|
||||
response.Status = true;
|
||||
@@ -96,9 +92,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
|
||||
{
|
||||
var request = BuildRequest("version", settings);
|
||||
|
||||
SabnzbdVersionResponse response;
|
||||
|
||||
if (!Json.TryDeserialize<SabnzbdVersionResponse>(ProcessRequest(request, settings), out response))
|
||||
if (!Json.TryDeserialize<SabnzbdVersionResponse>(ProcessRequest(request, settings), out var response))
|
||||
{
|
||||
response = new SabnzbdVersionResponse();
|
||||
}
|
||||
@@ -157,9 +151,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
|
||||
var request = BuildRequest("retry", settings);
|
||||
request.AddQueryParam("value", id);
|
||||
|
||||
SabnzbdRetryResponse response;
|
||||
|
||||
if (!Json.TryDeserialize<SabnzbdRetryResponse>(ProcessRequest(request, settings), out response))
|
||||
if (!Json.TryDeserialize<SabnzbdRetryResponse>(ProcessRequest(request, settings), out var response))
|
||||
{
|
||||
response = new SabnzbdRetryResponse();
|
||||
response.Status = true;
|
||||
@@ -230,9 +222,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
|
||||
|
||||
private void CheckForError(HttpResponse response)
|
||||
{
|
||||
SabnzbdJsonError result;
|
||||
|
||||
if (!Json.TryDeserialize<SabnzbdJsonError>(response.Content, out result))
|
||||
if (!Json.TryDeserialize<SabnzbdJsonError>(response.Content, out var result))
|
||||
{
|
||||
//Handle plain text responses from SAB
|
||||
result = new SabnzbdJsonError();
|
||||
|
@@ -46,8 +46,7 @@ namespace NzbDrone.Core.Download.Clients.Vuze
|
||||
|
||||
_logger.Debug("Vuze protocol version information: {0}", versionString);
|
||||
|
||||
int version;
|
||||
if (!int.TryParse(versionString, out version) || version < MINIMUM_SUPPORTED_PROTOCOL_VERSION)
|
||||
if (!int.TryParse(versionString, out var version) || version < MINIMUM_SUPPORTED_PROTOCOL_VERSION)
|
||||
{
|
||||
{
|
||||
return new ValidationFailure(string.Empty, "Protocol version not supported, use Vuze 5.0.0.0 or higher with Vuze Web Remote plugin.");
|
||||
|
@@ -61,8 +61,7 @@ namespace NzbDrone.Core.Download
|
||||
|
||||
foreach (var client in clients)
|
||||
{
|
||||
DownloadClientStatus downloadClientStatus;
|
||||
if (blockedIndexers.TryGetValue(client.Definition.Id, out downloadClientStatus))
|
||||
if (blockedIndexers.TryGetValue(client.Definition.Id, out var downloadClientStatus))
|
||||
{
|
||||
_logger.Debug("Temporarily ignoring download client {0} till {1} due to recent failures.", client.Definition.Name, downloadClientStatus.DisabledTill.Value.ToLocalTime());
|
||||
continue;
|
||||
|
@@ -160,8 +160,7 @@ namespace NzbDrone.Core.HealthCheck
|
||||
_isRunningHealthChecksAfterGracePeriod = false;
|
||||
}
|
||||
|
||||
IEventDrivenHealthCheck[] checks;
|
||||
if (!_eventDrivenHealthChecks.TryGetValue(message.GetType(), out checks))
|
||||
if (!_eventDrivenHealthChecks.TryGetValue(message.GetType(), out var checks))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
@@ -36,10 +36,9 @@ namespace NzbDrone.Core.Indexers.BroadcastheNet
|
||||
var releaseInfo = _indexerStatusService.GetLastRssSyncReleaseInfo(Definition.Id);
|
||||
if (releaseInfo != null)
|
||||
{
|
||||
int torrentID;
|
||||
if (int.TryParse(releaseInfo.Guid.Replace("BTN-", string.Empty), out torrentID))
|
||||
if (int.TryParse(releaseInfo.Guid.Replace("BTN-", string.Empty), out var torrentId))
|
||||
{
|
||||
requestGenerator.LastRecentTorrentID = torrentID;
|
||||
requestGenerator.LastRecentTorrentID = torrentId;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -150,10 +150,8 @@ namespace NzbDrone.Core.Indexers.Headphones
|
||||
|
||||
protected override long GetSize(XElement item)
|
||||
{
|
||||
long size;
|
||||
|
||||
var sizeString = TryGetNewznabAttribute(item, "size");
|
||||
if (!sizeString.IsNullOrWhiteSpace() && long.TryParse(sizeString, out size))
|
||||
if (!sizeString.IsNullOrWhiteSpace() && long.TryParse(sizeString, out var size))
|
||||
{
|
||||
return size;
|
||||
}
|
||||
@@ -189,9 +187,8 @@ namespace NzbDrone.Core.Indexers.Headphones
|
||||
protected virtual int GetImdbId(XElement item)
|
||||
{
|
||||
var imdbIdString = TryGetNewznabAttribute(item, "imdb");
|
||||
int imdbId;
|
||||
|
||||
if (!imdbIdString.IsNullOrWhiteSpace() && int.TryParse(imdbIdString, out imdbId))
|
||||
if (!imdbIdString.IsNullOrWhiteSpace() && int.TryParse(imdbIdString, out var imdbId))
|
||||
{
|
||||
return imdbId;
|
||||
}
|
||||
@@ -202,9 +199,8 @@ namespace NzbDrone.Core.Indexers.Headphones
|
||||
protected virtual int GetGrabs(XElement item)
|
||||
{
|
||||
var grabsString = TryGetNewznabAttribute(item, "grabs");
|
||||
int grabs;
|
||||
|
||||
if (!grabsString.IsNullOrWhiteSpace() && int.TryParse(grabsString, out grabs))
|
||||
if (!grabsString.IsNullOrWhiteSpace() && int.TryParse(grabsString, out var grabs))
|
||||
{
|
||||
return grabs;
|
||||
}
|
||||
@@ -215,9 +211,8 @@ namespace NzbDrone.Core.Indexers.Headphones
|
||||
protected virtual int GetFiles(XElement item)
|
||||
{
|
||||
var filesString = TryGetNewznabAttribute(item, "files");
|
||||
int files;
|
||||
|
||||
if (!filesString.IsNullOrWhiteSpace() && int.TryParse(filesString, out files))
|
||||
if (!filesString.IsNullOrWhiteSpace() && int.TryParse(filesString, out var files))
|
||||
{
|
||||
return files;
|
||||
}
|
||||
@@ -228,9 +223,8 @@ namespace NzbDrone.Core.Indexers.Headphones
|
||||
protected virtual int GetImdbYear(XElement item)
|
||||
{
|
||||
var imdbYearString = TryGetNewznabAttribute(item, "imdbyear");
|
||||
int imdbYear;
|
||||
|
||||
if (!imdbYearString.IsNullOrWhiteSpace() && int.TryParse(imdbYearString, out imdbYear))
|
||||
if (!imdbYearString.IsNullOrWhiteSpace() && int.TryParse(imdbYearString, out var imdbYear))
|
||||
{
|
||||
return imdbYear;
|
||||
}
|
||||
|
@@ -178,10 +178,8 @@ namespace NzbDrone.Core.Indexers.Newznab
|
||||
|
||||
protected override long GetSize(XElement item)
|
||||
{
|
||||
long size;
|
||||
|
||||
var sizeString = TryGetNewznabAttribute(item, "size");
|
||||
if (!sizeString.IsNullOrWhiteSpace() && long.TryParse(sizeString, out size))
|
||||
if (!sizeString.IsNullOrWhiteSpace() && long.TryParse(sizeString, out var size))
|
||||
{
|
||||
return size;
|
||||
}
|
||||
@@ -241,9 +239,8 @@ namespace NzbDrone.Core.Indexers.Newznab
|
||||
foreach (var attr in attributes)
|
||||
{
|
||||
var idString = TryGetNewznabAttribute(item, attr);
|
||||
int idInt;
|
||||
|
||||
if (!idString.IsNullOrWhiteSpace() && int.TryParse(idString, out idInt))
|
||||
if (!idString.IsNullOrWhiteSpace() && int.TryParse(idString, out var idInt))
|
||||
{
|
||||
return idInt;
|
||||
}
|
||||
@@ -260,9 +257,8 @@ namespace NzbDrone.Core.Indexers.Newznab
|
||||
protected virtual int GetImdbYear(XElement item)
|
||||
{
|
||||
var imdbYearString = TryGetNewznabAttribute(item, "imdbyear");
|
||||
int imdbYear;
|
||||
|
||||
if (!imdbYearString.IsNullOrWhiteSpace() && int.TryParse(imdbYearString, out imdbYear))
|
||||
if (!imdbYearString.IsNullOrWhiteSpace() && int.TryParse(imdbYearString, out var imdbYear))
|
||||
{
|
||||
return imdbYear;
|
||||
}
|
||||
|
@@ -149,10 +149,8 @@ namespace NzbDrone.Core.Indexers.Torznab
|
||||
|
||||
protected override long GetSize(XElement item)
|
||||
{
|
||||
long size;
|
||||
|
||||
var sizeString = TryGetTorznabAttribute(item, "size");
|
||||
if (!sizeString.IsNullOrWhiteSpace() && long.TryParse(sizeString, out size))
|
||||
if (!sizeString.IsNullOrWhiteSpace() && long.TryParse(sizeString, out var size))
|
||||
{
|
||||
return size;
|
||||
}
|
||||
@@ -298,9 +296,7 @@ namespace NzbDrone.Core.Indexers.Torznab
|
||||
{
|
||||
var attr = TryGetTorznabAttribute(item, key, defaultValue.ToString());
|
||||
|
||||
float result = 0;
|
||||
|
||||
if (float.TryParse(attr, out result))
|
||||
if (float.TryParse(attr, out var result))
|
||||
{
|
||||
return result;
|
||||
}
|
||||
@@ -330,9 +326,8 @@ namespace NzbDrone.Core.Indexers.Torznab
|
||||
foreach (var attr in attributes)
|
||||
{
|
||||
var idString = TryGetTorznabAttribute(item, attr);
|
||||
int idInt;
|
||||
|
||||
if (!idString.IsNullOrWhiteSpace() && int.TryParse(idString, out idInt))
|
||||
if (!idString.IsNullOrWhiteSpace() && int.TryParse(idString, out var idInt))
|
||||
{
|
||||
return idInt;
|
||||
}
|
||||
|
@@ -245,8 +245,7 @@ namespace NzbDrone.Core.Indexers
|
||||
|
||||
foreach (var indexer in indexers)
|
||||
{
|
||||
IndexerStatus blockedIndexerStatus;
|
||||
if (blockedIndexers.TryGetValue(indexer.Definition.Id, out blockedIndexerStatus))
|
||||
if (blockedIndexers.TryGetValue(indexer.Definition.Id, out var blockedIndexerStatus))
|
||||
{
|
||||
_logger.Debug("Temporarily ignoring indexer {0} till {1} due to recent failures.", indexer.Definition.Name, blockedIndexerStatus.DisabledTill.Value.ToLocalTime());
|
||||
continue;
|
||||
|
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
@@ -37,8 +37,7 @@ namespace NzbDrone.Core.Indexers
|
||||
{
|
||||
try
|
||||
{
|
||||
DateTime result;
|
||||
if (!DateTime.TryParse(dateString, DateTimeFormatInfo.InvariantInfo, DateTimeStyles.AssumeUniversal, out result))
|
||||
if (!DateTime.TryParse(dateString, DateTimeFormatInfo.InvariantInfo, DateTimeStyles.AssumeUniversal, out var result))
|
||||
{
|
||||
dateString = RemoveTimeZoneRegex.Replace(dateString, "");
|
||||
result = DateTime.Parse(dateString, DateTimeFormatInfo.InvariantInfo, DateTimeStyles.AssumeUniversal);
|
||||
|
@@ -75,8 +75,7 @@ namespace NzbDrone.Core.Messaging.Events
|
||||
EventSubscribers<TEvent> subscribers;
|
||||
lock (_eventSubscribers)
|
||||
{
|
||||
object target;
|
||||
if (!_eventSubscribers.TryGetValue(eventName, out target))
|
||||
if (!_eventSubscribers.TryGetValue(eventName, out var target))
|
||||
{
|
||||
_eventSubscribers[eventName] = target = new EventSubscribers<TEvent>(_serviceFactory);
|
||||
}
|
||||
|
@@ -152,14 +152,13 @@ namespace NzbDrone.Core.Notifications.PushBullet
|
||||
private HttpRequestBuilder BuildDeviceRequest(string deviceId)
|
||||
{
|
||||
var requestBuilder = new HttpRequestBuilder(PUSH_URL).Post();
|
||||
long integerId;
|
||||
|
||||
if (deviceId.IsNullOrWhiteSpace())
|
||||
{
|
||||
return requestBuilder;
|
||||
}
|
||||
|
||||
if (long.TryParse(deviceId, out integerId))
|
||||
if (long.TryParse(deviceId, out var integerId))
|
||||
{
|
||||
requestBuilder.AddFormParameter("device_id", integerId);
|
||||
}
|
||||
|
@@ -111,9 +111,8 @@ namespace NzbDrone.Core.Parser
|
||||
{
|
||||
parsed_date_time = null;
|
||||
|
||||
ParsedDateTime parsed_date;
|
||||
ParsedDateTime parsed_time;
|
||||
if (!TryParseDate(str, default_format, out parsed_date))
|
||||
if (!TryParseDate(str, default_format, out var parsed_date))
|
||||
{
|
||||
if (!TryParseTime(str, default_format, out parsed_time, null))
|
||||
{
|
||||
@@ -314,8 +313,7 @@ namespace NzbDrone.Core.Parser
|
||||
m = Regex.Match(str, @"(?<=^|[^\d])(?'year'\d{2}|\d{4})\s*(?'separator'[\-])\s*(?'month'\d{1,2})\s*\'separator'+\s*(?'day'\d{1,2})(?=$|[^\d])", RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
||||
if (m.Success)
|
||||
{
|
||||
DateTime date;
|
||||
if (!ConvertToDate(int.Parse(m.Groups["year"].Value), int.Parse(m.Groups["month"].Value), int.Parse(m.Groups["day"].Value), out date))
|
||||
if (!ConvertToDate(int.Parse(m.Groups["year"].Value), int.Parse(m.Groups["month"].Value), int.Parse(m.Groups["day"].Value), out var date))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -417,8 +415,7 @@ namespace NzbDrone.Core.Parser
|
||||
year = DefaultDate.Year;
|
||||
}
|
||||
|
||||
DateTime date;
|
||||
if (!ConvertToDate(year, month, int.Parse(m.Groups["day"].Value), out date))
|
||||
if (!ConvertToDate(year, month, int.Parse(m.Groups["day"].Value), out var date))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
@@ -52,9 +52,7 @@ namespace NzbDrone.Core.Parser.RomanNumerals
|
||||
/// <param name="romanNumeral">The roman numeral.</param>
|
||||
public RomanNumeral(string romanNumeral)
|
||||
{
|
||||
int value;
|
||||
|
||||
if (TryParse(romanNumeral, out value))
|
||||
if (TryParse(romanNumeral, out var value))
|
||||
{
|
||||
_value = value;
|
||||
}
|
||||
@@ -312,10 +310,9 @@ namespace NzbDrone.Core.Parser.RomanNumerals
|
||||
}
|
||||
else if (obj is string)
|
||||
{
|
||||
int value;
|
||||
var numeral = obj as string;
|
||||
|
||||
if (TryParse(numeral, out value))
|
||||
if (TryParse(numeral, out var value))
|
||||
{
|
||||
return _value.CompareTo(value);
|
||||
}
|
||||
|
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
@@ -28,8 +28,7 @@ namespace NzbDrone.Core.Parser.RomanNumerals
|
||||
_simpleArabicNumeralMappings = new Dictionary<SimpleArabicNumeral, SimpleRomanNumeral>();
|
||||
foreach (int arabicNumeral in Enumerable.Range(1, DICTIONARY_PREPOPULATION_SIZE + 1))
|
||||
{
|
||||
string romanNumeralAsString, arabicNumeralAsString;
|
||||
GenerateRomanNumerals(arabicNumeral, out romanNumeralAsString, out arabicNumeralAsString);
|
||||
GenerateRomanNumerals(arabicNumeral, out var romanNumeralAsString, out var arabicNumeralAsString);
|
||||
ArabicRomanNumeral arm = new ArabicRomanNumeral(arabicNumeral, arabicNumeralAsString, romanNumeralAsString);
|
||||
_arabicRomanNumeralsMapping.Add(arm);
|
||||
|
||||
@@ -51,9 +50,7 @@ namespace NzbDrone.Core.Parser.RomanNumerals
|
||||
HashSet<ArabicRomanNumeral> additionalArabicRomanNumerals = new HashSet<ArabicRomanNumeral>();
|
||||
foreach (int arabicNumeral in Enumerable.Range(offset, length))
|
||||
{
|
||||
string romanNumeral;
|
||||
string arabicNumeralAsString;
|
||||
GenerateRomanNumerals(arabicNumeral, out romanNumeral, out arabicNumeralAsString);
|
||||
GenerateRomanNumerals(arabicNumeral, out var romanNumeral, out var arabicNumeralAsString);
|
||||
ArabicRomanNumeral arm = new ArabicRomanNumeral(arabicNumeral, arabicNumeralAsString, romanNumeral);
|
||||
additionalArabicRomanNumerals.Add(arm);
|
||||
}
|
||||
@@ -129,9 +126,7 @@ namespace NzbDrone.Core.Parser.RomanNumerals
|
||||
Dictionary<SimpleArabicNumeral, SimpleRomanNumeral> moreNumerals = new Dictionary<SimpleArabicNumeral, SimpleRomanNumeral>();
|
||||
foreach (int arabicNumeral in Enumerable.Range(offset, length))
|
||||
{
|
||||
string romanNumeral;
|
||||
string arabicNumeralAsString;
|
||||
GenerateRomanNumerals(arabicNumeral, out romanNumeral, out arabicNumeralAsString);
|
||||
GenerateRomanNumerals(arabicNumeral, out var romanNumeral, out _);
|
||||
SimpleArabicNumeral san = new SimpleArabicNumeral(arabicNumeral);
|
||||
SimpleRomanNumeral srn = new SimpleRomanNumeral(romanNumeral);
|
||||
moreNumerals.Add(san, srn);
|
||||
|
@@ -57,8 +57,7 @@ namespace NzbDrone.Mono.Test.DiskProviderTests
|
||||
protected void SetWritePermissionsInternal(string path, bool writable, bool setgid)
|
||||
{
|
||||
// Remove Write permissions, we're still owner so we can clean it up, but we'll have to do that explicitly.
|
||||
Stat stat;
|
||||
Syscall.stat(path, out stat);
|
||||
Syscall.stat(path, out var stat);
|
||||
FilePermissions mode = stat.st_mode;
|
||||
|
||||
if (writable)
|
||||
|
@@ -474,9 +474,7 @@ namespace NzbDrone.Mono.Disk
|
||||
return UNCHANGED_ID;
|
||||
}
|
||||
|
||||
uint userId;
|
||||
|
||||
if (uint.TryParse(user, out userId))
|
||||
if (uint.TryParse(user, out var userId))
|
||||
{
|
||||
return userId;
|
||||
}
|
||||
@@ -498,9 +496,7 @@ namespace NzbDrone.Mono.Disk
|
||||
return UNCHANGED_ID;
|
||||
}
|
||||
|
||||
uint groupId;
|
||||
|
||||
if (uint.TryParse(group, out groupId))
|
||||
if (uint.TryParse(group, out var groupId))
|
||||
{
|
||||
return groupId;
|
||||
}
|
||||
|
@@ -83,9 +83,7 @@ namespace NzbDrone.Mono.Disk
|
||||
|
||||
private bool TryFollowFirstSymbolicLink(ref string path)
|
||||
{
|
||||
string[] dirs;
|
||||
int lastIndex;
|
||||
GetPathComponents(path, out dirs, out lastIndex);
|
||||
GetPathComponents(path, out var dirs, out var lastIndex);
|
||||
|
||||
if (lastIndex == 0)
|
||||
{
|
||||
|
@@ -23,8 +23,7 @@ namespace NzbDrone.Test.Common
|
||||
{
|
||||
LogManager.Configuration = new LoggingConfiguration();
|
||||
|
||||
var logOutput = TestLogOutput.Console;
|
||||
Enum.TryParse<TestLogOutput>(Environment.GetEnvironmentVariable("PROWLARR_TESTS_LOG_OUTPUT"), out logOutput);
|
||||
Enum.TryParse<TestLogOutput>(Environment.GetEnvironmentVariable("PROWLARR_TESTS_LOG_OUTPUT"), out var logOutput);
|
||||
|
||||
RegisterSentryLogger();
|
||||
|
||||
|
@@ -99,8 +99,7 @@ namespace NzbDrone.Update
|
||||
|
||||
private int ParseProcessId(string arg)
|
||||
{
|
||||
int id;
|
||||
if (!int.TryParse(arg, out id) || id <= 0)
|
||||
if (!int.TryParse(arg, out var id) || id <= 0)
|
||||
{
|
||||
throw new ArgumentOutOfRangeException("arg", "Invalid process ID");
|
||||
}
|
||||
|
@@ -92,8 +92,7 @@ namespace NzbDrone.Windows.Disk
|
||||
PropagationFlags.InheritOnly,
|
||||
controlType);
|
||||
|
||||
bool modified;
|
||||
directorySecurity.ModifyAccessRule(AccessControlModification.Add, accessRule, out modified);
|
||||
directorySecurity.ModifyAccessRule(AccessControlModification.Add, accessRule, out var modified);
|
||||
|
||||
if (modified)
|
||||
{
|
||||
@@ -142,11 +141,7 @@ namespace NzbDrone.Windows.Disk
|
||||
folderName += '\\';
|
||||
}
|
||||
|
||||
ulong free = 0;
|
||||
ulong dummy1 = 0;
|
||||
ulong dummy2 = 0;
|
||||
|
||||
if (GetDiskFreeSpaceEx(folderName, out free, out dummy1, out dummy2))
|
||||
if (GetDiskFreeSpaceEx(folderName, out var free, out var dummy1, out var dummy2))
|
||||
{
|
||||
return (long)free;
|
||||
}
|
||||
@@ -163,11 +158,7 @@ namespace NzbDrone.Windows.Disk
|
||||
folderName += '\\';
|
||||
}
|
||||
|
||||
ulong total = 0;
|
||||
ulong dummy1 = 0;
|
||||
ulong dummy2 = 0;
|
||||
|
||||
if (GetDiskFreeSpaceEx(folderName, out dummy1, out total, out dummy2))
|
||||
if (GetDiskFreeSpaceEx(folderName, out var dummy1, out var total, out var dummy2))
|
||||
{
|
||||
return (long)total;
|
||||
}
|
||||
|
@@ -67,8 +67,7 @@ namespace Prowlarr.Http.ClientSchema
|
||||
{
|
||||
lock (_mappings)
|
||||
{
|
||||
FieldMapping[] result;
|
||||
if (!_mappings.TryGetValue(type, out result))
|
||||
if (!_mappings.TryGetValue(type, out var result))
|
||||
{
|
||||
result = GetFieldMapping(type, "", v => v);
|
||||
|
||||
|
Reference in New Issue
Block a user