mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Replaced manual argument validations with Ensure.

This commit is contained in:
kayone 2013-12-02 22:41:40 -08:00
parent b055fc5ade
commit 76bc4aaa9c
4 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/NzbDrone.Common/DiskProvider.cs
View File

@ -506,10 +506,7 @@ namespace NzbDrone.Common
private static long DriveFreeSpaceEx(string folderName)
{
if (string.IsNullOrEmpty(folderName))
{
throw new ArgumentNullException("folderName");
}
Ensure.That(folderName, () => folderName).IsValidPath();
if (!folderName.EndsWith("\\"))
{
@ -530,10 +527,7 @@ namespace NzbDrone.Common
private static long DriveTotalSizeEx(string folderName)
{
if (string.IsNullOrEmpty(folderName))
{
throw new ArgumentNullException("folderName");
}
Ensure.That(folderName, () => folderName).IsValidPath();
if (!folderName.EndsWith("\\"))
{

10
src/NzbDrone.Core/Configuration/ConfigService.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using NLog;
using NzbDrone.Common.EnsureThat;
using NzbDrone.Core.Configuration.Events;
using NzbDrone.Core.Download;
using NzbDrone.Core.Download.Clients.Nzbget;
@ -305,9 +306,11 @@ namespace NzbDrone.Core.Configuration
public string GetValue(string key, object defaultValue, bool persist = false)
{
key = key.ToLowerInvariant();
Ensure.That(key, () => key).IsNotNullOrWhiteSpace();
EnsureCache();
key = key.ToLowerInvariant();
string dbValue;
if (_cache.TryGetValue(key, out dbValue) && dbValue != null && !String.IsNullOrEmpty(dbValue))
@ -336,11 +339,6 @@ namespace NzbDrone.Core.Configuration
{
key = key.ToLowerInvariant();
if (String.IsNullOrEmpty(key))
throw new ArgumentOutOfRangeException("key");
if (value == null)
throw new ArgumentNullException("key");
_logger.Trace("Writing Setting to file. Key:'{0}' Value:'{1}'", key, value);
var dbValue = _repository.Get(key);

1
src/NzbDrone.Core/DataAugmentation/Xem/XemService.cs
View File

@ -20,7 +20,6 @@ namespace NzbDrone.Core.DataAugmentation.Xem
IXemProxy xemProxy,
ISeriesService seriesService, ICacheManger cacheManger, Logger logger)
{
if (seriesService == null) throw new ArgumentNullException("seriesService");
_episodeService = episodeService;
_xemProxy = xemProxy;
_seriesService = seriesService;

5
src/NzbDrone.Core/Fluent.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using NzbDrone.Common.EnsureThat;
namespace NzbDrone.Core
{
@ -9,8 +10,8 @@ namespace NzbDrone.Core
{
public static string WithDefault(this string actual, object defaultValue)
{
if (defaultValue == null)
throw new ArgumentNullException("defaultValue");
Ensure.That(defaultValue, () => defaultValue).IsNotNull();
if (String.IsNullOrWhiteSpace(actual))
{
return defaultValue.ToString();