Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement equality checks for providers

This commit is contained in:
Bogdan 2024-04-14 07:16:26 +03:00 committed by Mark McDowall
parent 536ff142c3
commit 084fcc2295
84 changed files with 517 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/NzbDrone.Core.Test/NotificationTests/NotificationBaseFixture.cs
View File

@ -5,7 +5,6 @@ using FluentValidation.Results;
using NUnit.Framework;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.Notifications;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Tv;
using NzbDrone.Core.Validation;
using NzbDrone.Test.Common;
@ -15,9 +14,9 @@ namespace NzbDrone.Core.Test.NotificationTests
[TestFixture]
public class NotificationBaseFixture : TestBase
{
private class TestSetting : IProviderConfig
private class TestSetting : NotificationSettingsBase<TestSetting>
{
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult();
}

7
src/NzbDrone.Core/Download/Clients/Aria2/Aria2Settings.cs
View File

@ -1,6 +1,5 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download.Clients.Aria2
@ -13,9 +12,9 @@ namespace NzbDrone.Core.Download.Clients.Aria2
}
}
public class Aria2Settings : IProviderConfig
public class Aria2Settings : DownloadClientSettingsBase<Aria2Settings>
{
private static readonly Aria2SettingsValidator Validator = new Aria2SettingsValidator();
private static readonly Aria2SettingsValidator Validator = new ();
public Aria2Settings()
{
@ -44,7 +43,7 @@ namespace NzbDrone.Core.Download.Clients.Aria2
[FieldDefinition(5, Label = "Directory", Type = FieldType.Textbox, HelpText = "DownloadClientAriaSettingsDirectoryHelpText")]
public string Directory { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Download/Clients/Blackhole/TorrentBlackholeSettings.cs
View File

@ -2,7 +2,6 @@ using System.ComponentModel;
using FluentValidation;
using Newtonsoft.Json;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
using NzbDrone.Core.Validation.Paths;
@ -18,7 +17,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
}
}
public class TorrentBlackholeSettings : IProviderConfig
public class TorrentBlackholeSettings : DownloadClientSettingsBase<TorrentBlackholeSettings>
{
public TorrentBlackholeSettings()
{
@ -26,7 +25,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
ReadOnly = true;
}
private static readonly TorrentBlackholeSettingsValidator Validator = new TorrentBlackholeSettingsValidator();
private static readonly TorrentBlackholeSettingsValidator Validator = new ();
[FieldDefinition(0, Label = "TorrentBlackholeTorrentFolder", Type = FieldType.Path, HelpText = "BlackholeFolderHelpText")]
[FieldToken(TokenField.HelpText, "TorrentBlackholeTorrentFolder", "extension", ".torrent")]
@ -48,7 +47,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
[FieldDefinition(4, Label = "TorrentBlackholeSaveMagnetFilesReadOnly", Type = FieldType.Checkbox, HelpText = "TorrentBlackholeSaveMagnetFilesReadOnlyHelpText")]
public bool ReadOnly { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

9
src/NzbDrone.Core/Download/Clients/Blackhole/UsenetBlackholeSettings.cs
View File

@ -1,6 +1,5 @@
using FluentValidation;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
using NzbDrone.Core.Validation.Paths;
@ -15,9 +14,9 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
}
}
public class UsenetBlackholeSettings : IProviderConfig
public class UsenetBlackholeSettings : DownloadClientSettingsBase<UsenetBlackholeSettings>
{
private static readonly UsenetBlackholeSettingsValidator Validator = new UsenetBlackholeSettingsValidator();
private static readonly UsenetBlackholeSettingsValidator Validator = new ();
[FieldDefinition(0, Label = "UsenetBlackholeNzbFolder", Type = FieldType.Path, HelpText = "BlackholeFolderHelpText")]
[FieldToken(TokenField.HelpText, "UsenetBlackholeNzbFolder", "extension", ".nzb")]
@ -26,7 +25,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
[FieldDefinition(1, Label = "BlackholeWatchFolder", Type = FieldType.Path, HelpText = "BlackholeWatchFolderHelpText")]
public string WatchFolder { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Download/Clients/Deluge/DelugeSettings.cs
View File

@ -1,6 +1,5 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download.Clients.Deluge
@ -17,9 +16,9 @@ namespace NzbDrone.Core.Download.Clients.Deluge
}
}
public class DelugeSettings : IProviderConfig
public class DelugeSettings : DownloadClientSettingsBase<DelugeSettings>
{
private static readonly DelugeSettingsValidator Validator = new DelugeSettingsValidator();
private static readonly DelugeSettingsValidator Validator = new ();
public DelugeSettings()
{
@ -67,7 +66,7 @@ namespace NzbDrone.Core.Download.Clients.Deluge
[FieldDefinition(11, Label = "DownloadClientDelugeSettingsDirectoryCompleted", Type = FieldType.Textbox, Advanced = true, HelpText = "DownloadClientDelugeSettingsDirectoryCompletedHelpText")]
public string CompletedDirectory { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

30
src/NzbDrone.Core/Download/Clients/DownloadClientSettingsBase.cs Normal file
View File

@ -0,0 +1,30 @@
using System;
using Equ;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download.Clients
{
public abstract class DownloadClientSettingsBase<TSettings> : IProviderConfig, IEquatable<TSettings>
where TSettings : DownloadClientSettingsBase<TSettings>
{
private static readonly MemberwiseEqualityComparer<TSettings> Comparer = MemberwiseEqualityComparer<TSettings>.ByProperties;
public abstract NzbDroneValidationResult Validate();
public bool Equals(TSettings other)
{
return Comparer.Equals(this as TSettings, other);
}
public override bool Equals(object obj)
{
return Equals(obj as TSettings);
}
public override int GetHashCode()
{
return Comparer.GetHashCode(this as TSettings);
}
}
}

9
src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStationSettings.cs
View File

@ -1,8 +1,7 @@
using System.Text.RegularExpressions;
using System.Text.RegularExpressions;
using FluentValidation;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download.Clients.DownloadStation
@ -26,9 +25,9 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
}
}
public class DownloadStationSettings : IProviderConfig
public class DownloadStationSettings : DownloadClientSettingsBase<DownloadStationSettings>
{
private static readonly DownloadStationSettingsValidator Validator = new DownloadStationSettingsValidator();
private static readonly DownloadStationSettingsValidator Validator = new ();
[FieldDefinition(0, Label = "Host", Type = FieldType.Textbox)]
public string Host { get; set; }
@ -58,7 +57,7 @@ namespace NzbDrone.Core.Download.Clients.DownloadStation
this.Port = 5000;
}
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Download/Clients/Flood/FloodSettings.cs
View File

@ -3,7 +3,6 @@ using System.Linq;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Download.Clients.Flood.Models;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download.Clients.Flood
@ -17,9 +16,9 @@ namespace NzbDrone.Core.Download.Clients.Flood
}
}
public class FloodSettings : IProviderConfig
public class FloodSettings : DownloadClientSettingsBase<FloodSettings>
{
private static readonly FloodSettingsValidator Validator = new FloodSettingsValidator();
private static readonly FloodSettingsValidator Validator = new ();
public FloodSettings()
{
@ -69,7 +68,7 @@ namespace NzbDrone.Core.Download.Clients.Flood
[FieldDefinition(10, Label = "DownloadClientFloodSettingsStartOnAdd", Type = FieldType.Checkbox)]
public bool StartOnAdd { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Download/Clients/FreeboxDownload/FreeboxDownloadSettings.cs
View File

@ -2,7 +2,6 @@ using System.Text.RegularExpressions;
using FluentValidation;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
using NzbDrone.Core.Validation.Paths;
@ -34,9 +33,9 @@ namespace NzbDrone.Core.Download.Clients.FreeboxDownload
}
}
public class FreeboxDownloadSettings : IProviderConfig
public class FreeboxDownloadSettings : DownloadClientSettingsBase<FreeboxDownloadSettings>
{
private static readonly FreeboxDownloadSettingsValidator Validator = new FreeboxDownloadSettingsValidator();
private static readonly FreeboxDownloadSettingsValidator Validator = new ();
public FreeboxDownloadSettings()
{
@ -84,7 +83,7 @@ namespace NzbDrone.Core.Download.Clients.FreeboxDownload
[FieldDefinition(10, Label = "DownloadClientSettingsAddPaused", Type = FieldType.Checkbox)]
public bool AddPaused { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

9
src/NzbDrone.Core/Download/Clients/Hadouken/HadoukenSettings.cs
View File

@ -1,7 +1,6 @@
using FluentValidation;
using FluentValidation;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download.Clients.Hadouken
@ -22,9 +21,9 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
}
}
public class HadoukenSettings : IProviderConfig
public class HadoukenSettings : DownloadClientSettingsBase<HadoukenSettings>
{
private static readonly HadoukenSettingsValidator Validator = new HadoukenSettingsValidator();
private static readonly HadoukenSettingsValidator Validator = new ();
public HadoukenSettings()
{
@ -57,7 +56,7 @@ namespace NzbDrone.Core.Download.Clients.Hadouken
[FieldDefinition(6, Label = "Category", Type = FieldType.Textbox, HelpText = "DownloadClientSettingsCategoryHelpText")]
public string Category { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

9
src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexSettings.cs
View File

@ -1,7 +1,6 @@
using FluentValidation;
using FluentValidation;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download.Clients.NzbVortex
@ -23,9 +22,9 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
}
}
public class NzbVortexSettings : IProviderConfig
public class NzbVortexSettings : DownloadClientSettingsBase<NzbVortexSettings>
{
private static readonly NzbVortexSettingsValidator Validator = new NzbVortexSettingsValidator();
private static readonly NzbVortexSettingsValidator Validator = new ();
public NzbVortexSettings()
{
@ -59,7 +58,7 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex
[FieldDefinition(6, Label = "DownloadClientSettingsOlderPriority", Type = FieldType.Select, SelectOptions = typeof(NzbVortexPriority), HelpText = "DownloadClientSettingsOlderPriorityEpisodeHelpText")]
public int OlderTvPriority { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetSettings.cs
View File

@ -1,7 +1,6 @@
using FluentValidation;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download.Clients.Nzbget
@ -21,9 +20,9 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
}
}
public class NzbgetSettings : IProviderConfig
public class NzbgetSettings : DownloadClientSettingsBase<NzbgetSettings>
{
private static readonly NzbgetSettingsValidator Validator = new NzbgetSettingsValidator();
private static readonly NzbgetSettingsValidator Validator = new ();
public NzbgetSettings()
{
@ -67,7 +66,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
[FieldDefinition(9, Label = "DownloadClientSettingsAddPaused", Type = FieldType.Checkbox, HelpText = "DownloadClientNzbgetSettingsAddPausedHelpText")]
public bool AddPaused { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

9
src/NzbDrone.Core/Download/Clients/Pneumatic/PneumaticSettings.cs
View File

@ -1,6 +1,5 @@
using FluentValidation;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
using NzbDrone.Core.Validation.Paths;
@ -15,9 +14,9 @@ namespace NzbDrone.Core.Download.Clients.Pneumatic
}
}
public class PneumaticSettings : IProviderConfig
public class PneumaticSettings : DownloadClientSettingsBase<PneumaticSettings>
{
private static readonly PneumaticSettingsValidator Validator = new PneumaticSettingsValidator();
private static readonly PneumaticSettingsValidator Validator = new ();
[FieldDefinition(0, Label = "DownloadClientPneumaticSettingsNzbFolder", Type = FieldType.Path, HelpText = "DownloadClientPneumaticSettingsNzbFolderHelpText")]
public string NzbFolder { get; set; }
@ -25,7 +24,7 @@ namespace NzbDrone.Core.Download.Clients.Pneumatic
[FieldDefinition(1, Label = "DownloadClientPneumaticSettingsStrmFolder", Type = FieldType.Path, HelpText = "DownloadClientPneumaticSettingsStrmFolderHelpText")]
public string StrmFolder { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentSettings.cs
View File

@ -1,7 +1,6 @@
using FluentValidation;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download.Clients.QBittorrent
@ -19,9 +18,9 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
}
}
public class QBittorrentSettings : IProviderConfig
public class QBittorrentSettings : DownloadClientSettingsBase<QBittorrentSettings>
{
private static readonly QBittorrentSettingsValidator Validator = new QBittorrentSettingsValidator();
private static readonly QBittorrentSettingsValidator Validator = new ();
public QBittorrentSettings()
{
@ -74,7 +73,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
[FieldDefinition(13, Label = "DownloadClientQbittorrentSettingsContentLayout", Type = FieldType.Select, SelectOptions = typeof(QBittorrentContentLayout), HelpText = "DownloadClientQbittorrentSettingsContentLayoutHelpText")]
public int ContentLayout { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

9
src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdSettings.cs
View File

@ -1,7 +1,6 @@
using FluentValidation;
using FluentValidation;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download.Clients.Sabnzbd
@ -32,9 +31,9 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
}
}
public class SabnzbdSettings : IProviderConfig
public class SabnzbdSettings : DownloadClientSettingsBase<SabnzbdSettings>
{
private static readonly SabnzbdSettingsValidator Validator = new SabnzbdSettingsValidator();
private static readonly SabnzbdSettingsValidator Validator = new ();
public SabnzbdSettings()
{
@ -78,7 +77,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
[FieldDefinition(9, Label = "DownloadClientSettingsOlderPriority", Type = FieldType.Select, SelectOptions = typeof(SabnzbdPriority), HelpText = "DownloadClientSettingsOlderPriorityEpisodeHelpText")]
public int OlderTvPriority { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

4
src/NzbDrone.Core/Download/Clients/TorrentSeedConfiguration.cs
View File

@ -1,10 +1,10 @@
using System;
using System;
namespace NzbDrone.Core.Download.Clients
{
public class TorrentSeedConfiguration
{
public static TorrentSeedConfiguration DefaultConfiguration = new TorrentSeedConfiguration();
public static TorrentSeedConfiguration DefaultConfiguration = new ();
public double? Ratio { get; set; }
public TimeSpan? SeedTime { get; set; }

7
src/NzbDrone.Core/Download/Clients/Transmission/TransmissionSettings.cs
View File

@ -2,7 +2,6 @@ using System.Text.RegularExpressions;
using FluentValidation;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download.Clients.Transmission
@ -24,9 +23,9 @@ namespace NzbDrone.Core.Download.Clients.Transmission
}
}
public class TransmissionSettings : IProviderConfig
public class TransmissionSettings : DownloadClientSettingsBase<TransmissionSettings>
{
private static readonly TransmissionSettingsValidator Validator = new TransmissionSettingsValidator();
private static readonly TransmissionSettingsValidator Validator = new ();
public TransmissionSettings()
{
@ -72,7 +71,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission
[FieldDefinition(10, Label = "DownloadClientSettingsAddPaused", Type = FieldType.Checkbox)]
public bool AddPaused { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Download/Clients/rTorrent/RTorrentSettings.cs
View File

@ -1,6 +1,5 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download.Clients.RTorrent
@ -17,9 +16,9 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
}
}
public class RTorrentSettings : IProviderConfig
public class RTorrentSettings : DownloadClientSettingsBase<RTorrentSettings>
{
private static readonly RTorrentSettingsValidator Validator = new RTorrentSettingsValidator();
private static readonly RTorrentSettingsValidator Validator = new ();
public RTorrentSettings()
{
@ -70,7 +69,7 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
[FieldDefinition(11, Label = "DownloadClientRTorrentSettingsAddStopped", Type = FieldType.Checkbox, HelpText = "DownloadClientRTorrentSettingsAddStoppedHelpText")]
public bool AddStopped { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Download/Clients/uTorrent/UTorrentSettings.cs
View File

@ -1,7 +1,6 @@
using FluentValidation;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Download.Clients.UTorrent
@ -17,9 +16,9 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
}
}
public class UTorrentSettings : IProviderConfig
public class UTorrentSettings : DownloadClientSettingsBase<UTorrentSettings>
{
private static readonly UTorrentSettingsValidator Validator = new UTorrentSettingsValidator();
private static readonly UTorrentSettingsValidator Validator = new ();
public UTorrentSettings()
{
@ -65,7 +64,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
[FieldToken(TokenField.HelpText, "DownloadClientSettingsInitialState", "clientName", "uTorrent")]
public int IntialState { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

25
src/NzbDrone.Core/Download/DownloadClientDefinition.cs
View File

@ -1,14 +1,35 @@
using NzbDrone.Core.Indexers;
using System;
using Equ;
using NzbDrone.Core.Indexers;
using NzbDrone.Core.ThingiProvider;
namespace NzbDrone.Core.Download
{
public class DownloadClientDefinition : ProviderDefinition
public class DownloadClientDefinition : ProviderDefinition, IEquatable<DownloadClientDefinition>
{
private static readonly MemberwiseEqualityComparer<DownloadClientDefinition> Comparer = MemberwiseEqualityComparer<DownloadClientDefinition>.ByProperties;
[MemberwiseEqualityIgnore]
public DownloadProtocol Protocol { get; set; }
public int Priority { get; set; } = 1;
public bool RemoveCompletedDownloads { get; set; } = true;
public bool RemoveFailedDownloads { get; set; } = true;
public bool Equals(DownloadClientDefinition other)
{
return Comparer.Equals(this, other);
}
public override bool Equals(object obj)
{
return Equals(obj as DownloadClientDefinition);
}
public override int GetHashCode()
{
return Comparer.GetHashCode(this);
}
}
}

9
src/NzbDrone.Core/ImportLists/AniList/AniListSettingsBase.cs
View File

@ -29,18 +29,17 @@ namespace NzbDrone.Core.ImportLists.AniList
}
}
public class AniListSettingsBase<TSettings> : IImportListSettings
public class AniListSettingsBase<TSettings> : ImportListSettingsBase<TSettings>
where TSettings : AniListSettingsBase<TSettings>
{
protected virtual AbstractValidator<TSettings> Validator => new AniListSettingsBaseValidator<TSettings>();
private static readonly AniListSettingsBaseValidator<TSettings> Validator = new ();
public AniListSettingsBase()
{
BaseUrl = "https://graphql.anilist.co";
SignIn = "startOAuth";
}
public string BaseUrl { get; set; }
public override string BaseUrl { get; set; } = "https://graphql.anilist.co";
[FieldDefinition(0, Label = "ImportListsSettingsAccessToken", Type = FieldType.Textbox, Hidden = HiddenType.Hidden)]
public string AccessToken { get; set; }
@ -54,7 +53,7 @@ namespace NzbDrone.Core.ImportLists.AniList
[FieldDefinition(99, Label = "ImportListsAniListSettingsAuthenticateWithAniList", Type = FieldType.OAuth)]
public string SignIn { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate((TSettings)this));
}

36
src/NzbDrone.Core/ImportLists/AniList/List/AniListSettings.cs
View File

@ -1,12 +1,12 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.ImportLists.AniList.List
{
public class AniListSettingsValidator : AniListSettingsBaseValidator<AniListSettings>
{
public AniListSettingsValidator()
: base()
{
RuleFor(c => c.Username).NotEmpty();
@ -18,10 +18,11 @@ namespace NzbDrone.Core.ImportLists.AniList.List
public class AniListSettings : AniListSettingsBase<AniListSettings>
{
public const string sectionImport = "Import List Status";
public const string SectionImport = "Import List Status";
private static readonly AniListSettingsValidator Validator = new ();
public AniListSettings()
: base()
{
ImportCurrent = true;
ImportPlanning = true;
@ -29,42 +30,45 @@ namespace NzbDrone.Core.ImportLists.AniList.List
ImportFinished = true;
}
protected override AbstractValidator<AniListSettings> Validator => new AniListSettingsValidator();
[FieldDefinition(1, Label = "Username", HelpText = "ImportListsAniListSettingsUsernameHelpText")]
public string Username { get; set; }
[FieldDefinition(2, Label = "ImportListsAniListSettingsImportWatching", Type = FieldType.Checkbox, Section = sectionImport, HelpText = "ImportListsAniListSettingsImportWatchingHelpText")]
[FieldDefinition(2, Label = "ImportListsAniListSettingsImportWatching", Type = FieldType.Checkbox, Section = SectionImport, HelpText = "ImportListsAniListSettingsImportWatchingHelpText")]
public bool ImportCurrent { get; set; }
[FieldDefinition(3, Label = "ImportListsAniListSettingsImportPlanning", Type = FieldType.Checkbox, Section = sectionImport, HelpText = "ImportListsAniListSettingsImportPlanningHelpText")]
[FieldDefinition(3, Label = "ImportListsAniListSettingsImportPlanning", Type = FieldType.Checkbox, Section = SectionImport, HelpText = "ImportListsAniListSettingsImportPlanningHelpText")]
public bool ImportPlanning { get; set; }
[FieldDefinition(4, Label = "ImportListsAniListSettingsImportCompleted", Type = FieldType.Checkbox, Section = sectionImport, HelpText = "ImportListsAniListSettingsImportCompletedHelpText")]
[FieldDefinition(4, Label = "ImportListsAniListSettingsImportCompleted", Type = FieldType.Checkbox, Section = SectionImport, HelpText = "ImportListsAniListSettingsImportCompletedHelpText")]
public bool ImportCompleted { get; set; }
[FieldDefinition(5, Label = "ImportListsAniListSettingsImportDropped", Type = FieldType.Checkbox, Section = sectionImport, HelpText = "ImportListsAniListSettingsImportDroppedHelpText")]
[FieldDefinition(5, Label = "ImportListsAniListSettingsImportDropped", Type = FieldType.Checkbox, Section = SectionImport, HelpText = "ImportListsAniListSettingsImportDroppedHelpText")]
public bool ImportDropped { get; set; }
[FieldDefinition(6, Label = "ImportListsAniListSettingsImportPaused", Type = FieldType.Checkbox, Section = sectionImport, HelpText = "ImportListsAniListSettingsImportPausedHelpText")]
[FieldDefinition(6, Label = "ImportListsAniListSettingsImportPaused", Type = FieldType.Checkbox, Section = SectionImport, HelpText = "ImportListsAniListSettingsImportPausedHelpText")]
public bool ImportPaused { get; set; }
[FieldDefinition(7, Label = "ImportListsAniListSettingsImportRepeating", Type = FieldType.Checkbox, Section = sectionImport, HelpText = "ImportListsAniListSettingsImportRepeatingHelpText")]
[FieldDefinition(7, Label = "ImportListsAniListSettingsImportRepeating", Type = FieldType.Checkbox, Section = SectionImport, HelpText = "ImportListsAniListSettingsImportRepeatingHelpText")]
public bool ImportRepeating { get; set; }
[FieldDefinition(8, Label = "ImportListsAniListSettingsImportFinished", Type = FieldType.Checkbox, Section = sectionImport, HelpText = "ImportListsAniListSettingsImportFinishedHelpText")]
[FieldDefinition(8, Label = "ImportListsAniListSettingsImportFinished", Type = FieldType.Checkbox, Section = SectionImport, HelpText = "ImportListsAniListSettingsImportFinishedHelpText")]
public bool ImportFinished { get; set; }
[FieldDefinition(9, Label = "ImportListsAniListSettingsImportReleasing", Type = FieldType.Checkbox, Section = sectionImport, HelpText = "ImportListsAniListSettingsImportReleasingHelpText")]
[FieldDefinition(9, Label = "ImportListsAniListSettingsImportReleasing", Type = FieldType.Checkbox, Section = SectionImport, HelpText = "ImportListsAniListSettingsImportReleasingHelpText")]
public bool ImportReleasing { get; set; }
[FieldDefinition(10, Label = "ImportListsAniListSettingsImportNotYetReleased", Type = FieldType.Checkbox, Section = sectionImport, HelpText = "ImportListsAniListSettingsImportNotYetReleasedHelpText")]
[FieldDefinition(10, Label = "ImportListsAniListSettingsImportNotYetReleased", Type = FieldType.Checkbox, Section = SectionImport, HelpText = "ImportListsAniListSettingsImportNotYetReleasedHelpText")]
public bool ImportUnreleased { get; set; }
[FieldDefinition(11, Label = "ImportListsAniListSettingsImportCancelled", Type = FieldType.Checkbox, Section = sectionImport, HelpText = "ImportListsAniListSettingsImportCancelledHelpText")]
[FieldDefinition(11, Label = "ImportListsAniListSettingsImportCancelled", Type = FieldType.Checkbox, Section = SectionImport, HelpText = "ImportListsAniListSettingsImportCancelledHelpText")]
public bool ImportCancelled { get; set; }
[FieldDefinition(12, Label = "ImportListsAniListSettingsImportHiatus", Type = FieldType.Checkbox, Section = sectionImport, HelpText = "ImportListsAniListSettingsImportHiatusHelpText")]
[FieldDefinition(12, Label = "ImportListsAniListSettingsImportHiatus", Type = FieldType.Checkbox, Section = SectionImport, HelpText = "ImportListsAniListSettingsImportHiatusHelpText")]
public bool ImportHiatus { get; set; }
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}
}
}

13
src/NzbDrone.Core/ImportLists/Custom/CustomSettings.cs
View File

@ -13,19 +13,14 @@ namespace NzbDrone.Core.ImportLists.Custom
}
}
public class CustomSettings : IImportListSettings
public class CustomSettings : ImportListSettingsBase<CustomSettings>
{
private static readonly CustomSettingsValidator Validator = new CustomSettingsValidator();
public CustomSettings()
{
BaseUrl = "";
}
private static readonly CustomSettingsValidator Validator = new ();
[FieldDefinition(0, Label = "ImportListsCustomListSettingsUrl", HelpText = "ImportListsCustomListSettingsUrlHelpText")]
public string BaseUrl { get; set; }
public override string BaseUrl { get; set; } = string.Empty;
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

8
src/NzbDrone.Core/ImportLists/Imdb/ImdbListSettings.cs
View File

@ -14,16 +14,16 @@ namespace NzbDrone.Core.ImportLists.Imdb
}
}
public class ImdbListSettings : IImportListSettings
public class ImdbListSettings : ImportListSettingsBase<ImdbListSettings>
{
private static readonly ImdbSettingsValidator Validator = new ImdbSettingsValidator();
private static readonly ImdbSettingsValidator Validator = new ();
public string BaseUrl { get; set; }
public override string BaseUrl { get; set; }
[FieldDefinition(1, Label = "ImportListsImdbSettingsListId", HelpText = "ImportListsImdbSettingsListIdHelpText")]
public string ListId { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

26
src/NzbDrone.Core/ImportLists/ImportListDefinition.cs
View File

@ -1,11 +1,14 @@
using System;
using Equ;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Tv;
namespace NzbDrone.Core.ImportLists
{
public class ImportListDefinition : ProviderDefinition
public class ImportListDefinition : ProviderDefinition, IEquatable<ImportListDefinition>
{
private static readonly MemberwiseEqualityComparer<ImportListDefinition> Comparer = MemberwiseEqualityComparer<ImportListDefinition>.ByProperties;
public bool EnableAutomaticAdd { get; set; }
public bool SearchForMissingEpisodes { get; set; }
public MonitorTypes ShouldMonitor { get; set; }
@ -15,10 +18,31 @@ namespace NzbDrone.Core.ImportLists
public bool SeasonFolder { get; set; }
public string RootFolderPath { get; set; }
[MemberwiseEqualityIgnore]
public override bool Enable => EnableAutomaticAdd;
[MemberwiseEqualityIgnore]
public ImportListStatus Status { get; set; }
[MemberwiseEqualityIgnore]
public ImportListType ListType { get; set; }
[MemberwiseEqualityIgnore]
public TimeSpan MinRefreshInterval { get; set; }
public bool Equals(ImportListDefinition other)
{
return Comparer.Equals(this, other);
}
public override bool Equals(object obj)
{
return Equals(obj as ImportListDefinition);
}
public override int GetHashCode()
{
return Comparer.GetHashCode(this);
}
}
}

31
src/NzbDrone.Core/ImportLists/ImportListSettingsBase.cs Normal file
View File

@ -0,0 +1,31 @@
using System;
using Equ;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.ImportLists
{
public abstract class ImportListSettingsBase<TSettings> : IImportListSettings, IEquatable<TSettings>
where TSettings : ImportListSettingsBase<TSettings>
{
private static readonly MemberwiseEqualityComparer<TSettings> Comparer = MemberwiseEqualityComparer<TSettings>.ByProperties;
public abstract string BaseUrl { get; set; }
public abstract NzbDroneValidationResult Validate();
public bool Equals(TSettings other)
{
return Comparer.Equals(this as TSettings, other);
}
public override bool Equals(object obj)
{
return Equals(obj as TSettings);
}
public override int GetHashCode()
{
return Comparer.GetHashCode(this as TSettings);
}
}
}

13
src/NzbDrone.Core/ImportLists/MyAnimeList/MyAnimeListSettings.cs
View File

@ -24,16 +24,11 @@ namespace NzbDrone.Core.ImportLists.MyAnimeList
}
}
public class MyAnimeListSettings : IImportListSettings
public class MyAnimeListSettings : ImportListSettingsBase<MyAnimeListSettings>
{
public string BaseUrl { get; set; }
private static readonly MalSettingsValidator Validator = new ();
protected AbstractValidator<MyAnimeListSettings> Validator => new MalSettingsValidator();
public MyAnimeListSettings()
{
BaseUrl = "https://api.myanimelist.net/v2";
}
public override string BaseUrl { get; set; } = "https://api.myanimelist.net/v2";
[FieldDefinition(0, Label = "ImportListsMyAnimeListSettingsListStatus", Type = FieldType.Select, SelectOptions = typeof(MyAnimeListStatus), HelpText = "ImportListsMyAnimeListSettingsListStatusHelpText")]
public int ListStatus { get; set; }
@ -50,7 +45,7 @@ namespace NzbDrone.Core.ImportLists.MyAnimeList
[FieldDefinition(99, Label = "ImportListsMyAnimeListSettingsAuthenticateWithMyAnimeList", Type = FieldType.OAuth)]
public string SignIn { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

8
src/NzbDrone.Core/ImportLists/Plex/PlexListSettings.cs
View File

@ -14,9 +14,9 @@ namespace NzbDrone.Core.ImportLists.Plex
}
}
public class PlexListSettings : IImportListSettings
public class PlexListSettings : ImportListSettingsBase<PlexListSettings>
{
protected virtual PlexListSettingsValidator Validator => new PlexListSettingsValidator();
private static readonly PlexListSettingsValidator Validator = new ();
public PlexListSettings()
{
@ -25,7 +25,7 @@ namespace NzbDrone.Core.ImportLists.Plex
public virtual string Scope => "";
public string BaseUrl { get; set; }
public override string BaseUrl { get; set; }
[FieldDefinition(0, Label = "ImportListsSettingsAccessToken", Type = FieldType.Textbox, Hidden = HiddenType.Hidden)]
public string AccessToken { get; set; }
@ -33,7 +33,7 @@ namespace NzbDrone.Core.ImportLists.Plex
[FieldDefinition(99, Label = "ImportListsPlexSettingsAuthenticateWithPlex", Type = FieldType.OAuth)]
public string SignIn { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

4
src/NzbDrone.Core/ImportLists/Rss/Plex/PlexRssImportSettings.cs
View File

@ -12,9 +12,9 @@ namespace NzbDrone.Core.ImportLists.Rss.Plex
}
}
public class PlexRssImportSettings : RssImportBaseSettings
public class PlexRssImportSettings : RssImportBaseSettings<PlexRssImportSettings>
{
private PlexRssImportSettingsValidator Validator => new ();
private static readonly PlexRssImportSettingsValidator Validator = new ();
[FieldDefinition(0, Label = "ImportListsSettingsRssUrl", Type = FieldType.Textbox, HelpLink = "https://app.plex.tv/desktop/#!/settings/watchlist")]
public override string Url { get; set; }

4
src/NzbDrone.Core/ImportLists/Rss/RssImportBase.cs
View File

@ -8,7 +8,7 @@ using NzbDrone.Core.Parser;
namespace NzbDrone.Core.ImportLists.Rss
{
public class RssImportBase<TSettings> : HttpImportListBase<TSettings>
where TSettings : RssImportBaseSettings, new()
where TSettings : RssImportBaseSettings<TSettings>, new()
{
public override string Name => "RSS List Base";
public override ImportListType ListType => ImportListType.Advanced;
@ -36,7 +36,7 @@ namespace NzbDrone.Core.ImportLists.Rss
public override IImportListRequestGenerator GetRequestGenerator()
{
return new RssImportRequestGenerator
return new RssImportRequestGenerator<TSettings>
{
Settings = Settings
};

14
src/NzbDrone.Core/ImportLists/Rss/RssImportBaseSettings.cs
View File

@ -4,7 +4,8 @@ using NzbDrone.Core.Validation;
namespace NzbDrone.Core.ImportLists.Rss
{
public class RssImportSettingsValidator : AbstractValidator<RssImportBaseSettings>
public class RssImportSettingsValidator<TSettings> : AbstractValidator<TSettings>
where TSettings : RssImportBaseSettings<TSettings>
{
public RssImportSettingsValidator()
{
@ -12,18 +13,19 @@ namespace NzbDrone.Core.ImportLists.Rss
}
}
public class RssImportBaseSettings : IImportListSettings
public class RssImportBaseSettings<TSettings> : ImportListSettingsBase<TSettings>
where TSettings : RssImportBaseSettings<TSettings>
{
private RssImportSettingsValidator Validator => new ();
private static readonly RssImportSettingsValidator<TSettings> Validator = new ();
public string BaseUrl { get; set; }
public override string BaseUrl { get; set; }
[FieldDefinition(0, Label = "ImportListsSettingsRssUrl", Type = FieldType.Textbox)]
public virtual string Url { get; set; }
public virtual NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
return new NzbDroneValidationResult(Validator.Validate(this as TSettings));
}
}
}

9
src/NzbDrone.Core/ImportLists/Rss/RssImportRequestGenerator.cs
View File

@ -3,9 +3,10 @@ using NzbDrone.Common.Http;
namespace NzbDrone.Core.ImportLists.Rss
{
public class RssImportRequestGenerator : IImportListRequestGenerator
public class RssImportRequestGenerator<TSettings> : IImportListRequestGenerator
where TSettings : RssImportBaseSettings<TSettings>, new()
{
public RssImportBaseSettings Settings { get; set; }
public RssImportBaseSettings<TSettings> Settings { get; set; }
public virtual ImportListPageableRequestChain GetListItems()
{
@ -18,9 +19,7 @@ namespace NzbDrone.Core.ImportLists.Rss
private IEnumerable<ImportListRequest> GetSeriesRequest()
{
var request = new ImportListRequest(Settings.Url, HttpAccept.Rss);
yield return request;
yield return new ImportListRequest(Settings.Url, HttpAccept.Rss);
}
}
}

9
src/NzbDrone.Core/ImportLists/Simkl/SimklSettingsBase.cs
View File

@ -24,18 +24,17 @@ namespace NzbDrone.Core.ImportLists.Simkl
}
}
public class SimklSettingsBase<TSettings> : IImportListSettings
public class SimklSettingsBase<TSettings> : ImportListSettingsBase<TSettings>
where TSettings : SimklSettingsBase<TSettings>
{
protected virtual AbstractValidator<TSettings> Validator => new SimklSettingsBaseValidator<TSettings>();
private static readonly SimklSettingsBaseValidator<TSettings> Validator = new ();
public SimklSettingsBase()
{
BaseUrl = "https://api.simkl.com";
SignIn = "startOAuth";
}
public string BaseUrl { get; set; }
public override string BaseUrl { get; set; } = "https://api.simkl.com";
[FieldDefinition(0, Label = "ImportListsSettingsAccessToken", Type = FieldType.Textbox, Hidden = HiddenType.Hidden)]
public string AccessToken { get; set; }
@ -52,7 +51,7 @@ namespace NzbDrone.Core.ImportLists.Simkl
[FieldDefinition(99, Label = "ImportListsSimklSettingsAuthenticatewithSimkl", Type = FieldType.OAuth)]
public string SignIn { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate((TSettings)this));
}

9
src/NzbDrone.Core/ImportLists/Simkl/User/SimklUserSettings.cs
View File

@ -1,12 +1,12 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.ImportLists.Simkl.User
{
public class SimklUserSettingsValidator : SimklSettingsBaseValidator<SimklUserSettings>
{
public SimklUserSettingsValidator()
: base()
{
RuleFor(c => c.ListType).NotNull();
}
@ -14,7 +14,7 @@ namespace NzbDrone.Core.ImportLists.Simkl.User
public class SimklUserSettings : SimklSettingsBase<SimklUserSettings>
{
protected override AbstractValidator<SimklUserSettings> Validator => new SimklUserSettingsValidator();
private static readonly SimklUserSettingsValidator Validator = new ();
public SimklUserSettings()
{
@ -27,5 +27,10 @@ namespace NzbDrone.Core.ImportLists.Simkl.User
[FieldDefinition(1, Label = "ImportListsSimklSettingsShowType", Type = FieldType.Select, SelectOptions = typeof(SimklUserShowType), HelpText = "ImportListsSimklSettingsShowTypeHelpText")]
public int ShowType { get; set; }
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}
}
}

9
src/NzbDrone.Core/ImportLists/Sonarr/SonarrSettings.cs
View File

@ -15,13 +15,12 @@ namespace NzbDrone.Core.ImportLists.Sonarr
}
}
public class SonarrSettings : IImportListSettings
public class SonarrSettings : ImportListSettingsBase<SonarrSettings>
{
private static readonly SonarrSettingsValidator Validator = new SonarrSettingsValidator();
private static readonly SonarrSettingsValidator Validator = new ();
public SonarrSettings()
{
BaseUrl = "";
ApiKey = "";
ProfileIds = Array.Empty<int>();
LanguageProfileIds = Array.Empty<int>();
@ -30,7 +29,7 @@ namespace NzbDrone.Core.ImportLists.Sonarr
}
[FieldDefinition(0, Label = "ImportListsSonarrSettingsFullUrl", HelpText = "ImportListsSonarrSettingsFullUrlHelpText")]
public string BaseUrl { get; set; }
public override string BaseUrl { get; set; } = string.Empty;
[FieldDefinition(1, Label = "ApiKey", HelpText = "ImportListsSonarrSettingsApiKeyHelpText")]
public string ApiKey { get; set; }
@ -51,7 +50,7 @@ namespace NzbDrone.Core.ImportLists.Sonarr
[FieldDefinition(6, Type = FieldType.Select, SelectOptionsProviderAction = "getLanguageProfiles", Label = "Language Profiles", HelpText = "Language Profiles from the source instance to import from")]
public IEnumerable<int> LanguageProfileIds { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

9
src/NzbDrone.Core/ImportLists/Trakt/List/TraktListSettings.cs
View File

@ -1,12 +1,12 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.ImportLists.Trakt.List
{
public class TraktListSettingsValidator : TraktSettingsBaseValidator<TraktListSettings>
{
public TraktListSettingsValidator()
: base()
{
RuleFor(c => c.Username).NotEmpty();
RuleFor(c => c.Listname).NotEmpty();
@ -15,12 +15,17 @@ namespace NzbDrone.Core.ImportLists.Trakt.List
public class TraktListSettings : TraktSettingsBase<TraktListSettings>
{
protected override AbstractValidator<TraktListSettings> Validator => new TraktListSettingsValidator();
private static readonly TraktListSettingsValidator Validator = new ();
[FieldDefinition(1, Label = "Username", HelpText = "ImportListsTraktSettingsUsernameHelpText")]
public string Username { get; set; }
[FieldDefinition(2, Label = "ImportListsTraktSettingsListName", HelpText = "ImportListsTraktSettingsListNameHelpText")]
public string Listname { get; set; }
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}
}
}

9
src/NzbDrone.Core/ImportLists/Trakt/Popular/TraktPopularSettings.cs
View File

@ -2,13 +2,13 @@ using System.Text.RegularExpressions;
using FluentValidation;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.ImportLists.Trakt.Popular
{
public class TraktPopularSettingsValidator : TraktSettingsBaseValidator<TraktPopularSettings>
{
public TraktPopularSettingsValidator()
: base()
{
RuleFor(c => c.TraktListType).NotNull();
@ -28,7 +28,7 @@ namespace NzbDrone.Core.ImportLists.Trakt.Popular
public class TraktPopularSettings : TraktSettingsBase<TraktPopularSettings>
{
protected override AbstractValidator<TraktPopularSettings> Validator => new TraktPopularSettingsValidator();
private static readonly TraktPopularSettingsValidator Validator = new ();
public TraktPopularSettings()
{
@ -46,5 +46,10 @@ namespace NzbDrone.Core.ImportLists.Trakt.Popular
[FieldDefinition(5, Label = "ImportListsTraktSettingsYears", HelpText = "ImportListsTraktSettingsYearsHelpText")]
public string Years { get; set; }
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}
}
}

9
src/NzbDrone.Core/ImportLists/Trakt/TraktSettingsBase.cs
View File

@ -34,19 +34,18 @@ namespace NzbDrone.Core.ImportLists.Trakt
}
}
public class TraktSettingsBase<TSettings> : IImportListSettings
public class TraktSettingsBase<TSettings> : ImportListSettingsBase<TSettings>
where TSettings : TraktSettingsBase<TSettings>
{
protected virtual AbstractValidator<TSettings> Validator => new TraktSettingsBaseValidator<TSettings>();
private static readonly TraktSettingsBaseValidator<TSettings> Validator = new ();
public TraktSettingsBase()
{
BaseUrl = "https://api.trakt.tv";
SignIn = "startOAuth";
Limit = 100;
}
public string BaseUrl { get; set; }
public override string BaseUrl { get; set; } = "https://api.trakt.tv";
[FieldDefinition(0, Label = "ImportListsSettingsAccessToken", Type = FieldType.Textbox, Hidden = HiddenType.Hidden)]
public string AccessToken { get; set; }
@ -69,7 +68,7 @@ namespace NzbDrone.Core.ImportLists.Trakt
[FieldDefinition(99, Label = "ImportListsTraktSettingsAuthenticateWithTrakt", Type = FieldType.OAuth)]
public string SignIn { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate((TSettings)this));
}

9
src/NzbDrone.Core/ImportLists/Trakt/User/TraktUserSettings.cs
View File

@ -1,12 +1,12 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.ImportLists.Trakt.User
{
public class TraktUserSettingsValidator : TraktSettingsBaseValidator<TraktUserSettings>
{
public TraktUserSettingsValidator()
: base()
{
RuleFor(c => c.TraktListType).NotNull();
RuleFor(c => c.TraktWatchedListType).NotNull();
@ -16,7 +16,7 @@ namespace NzbDrone.Core.ImportLists.Trakt.User
public class TraktUserSettings : TraktSettingsBase<TraktUserSettings>
{
protected override AbstractValidator<TraktUserSettings> Validator => new TraktUserSettingsValidator();
private static readonly TraktUserSettingsValidator Validator = new ();
public TraktUserSettings()
{
@ -36,6 +36,11 @@ namespace NzbDrone.Core.ImportLists.Trakt.User
[FieldDefinition(4, Label = "Username", HelpText = "ImportListsTraktSettingsUserListUsernameHelpText")]
public string Username { get; set; }
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}
}
public enum TraktUserWatchSorting

3
src/NzbDrone.Core/Indexers/BroadcastheNet/BroadcastheNetSettings.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using Equ;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Languages;
@ -18,7 +19,7 @@ namespace NzbDrone.Core.Indexers.BroadcastheNet
}
}
public class BroadcastheNetSettings : ITorrentIndexerSettings
public class BroadcastheNetSettings : PropertywiseEquatable<BroadcastheNetSettings>, ITorrentIndexerSettings
{
private static readonly BroadcastheNetSettingsValidator Validator = new ();

5
src/NzbDrone.Core/Indexers/Fanzub/FanzubSettings.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using Equ;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Languages;
@ -15,9 +16,9 @@ namespace NzbDrone.Core.Indexers.Fanzub
}
}
public class FanzubSettings : IIndexerSettings
public class FanzubSettings : PropertywiseEquatable<FanzubSettings>, IIndexerSettings
{
private static readonly FanzubSettingsValidator Validator = new FanzubSettingsValidator();
private static readonly FanzubSettingsValidator Validator = new ();
public FanzubSettings()
{

7
src/NzbDrone.Core/Indexers/FileList/FileListSettings.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using Equ;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Languages;
@ -19,9 +20,9 @@ namespace NzbDrone.Core.Indexers.FileList
}
}
public class FileListSettings : ITorrentIndexerSettings
public class FileListSettings : PropertywiseEquatable<FileListSettings>, ITorrentIndexerSettings
{
private static readonly FileListSettingsValidator Validator = new FileListSettingsValidator();
private static readonly FileListSettingsValidator Validator = new ();
public FileListSettings()
{
@ -61,7 +62,7 @@ namespace NzbDrone.Core.Indexers.FileList
public int MinimumSeeders { get; set; }
[FieldDefinition(7)]
public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings();
public SeedCriteriaSettings SeedCriteria { get; set; } = new ();
[FieldDefinition(8, Type = FieldType.Checkbox, Label = "IndexerSettingsRejectBlocklistedTorrentHashes", HelpText = "IndexerSettingsRejectBlocklistedTorrentHashesHelpText", Advanced = true)]
public bool RejectBlocklistedTorrentHashesWhileGrabbing { get; set; }

3
src/NzbDrone.Core/Indexers/HDBits/HDBitsSettings.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using Equ;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Languages;
@ -18,7 +19,7 @@ namespace NzbDrone.Core.Indexers.HDBits
}
}
public class HDBitsSettings : ITorrentIndexerSettings
public class HDBitsSettings : PropertywiseEquatable<HDBitsSettings>, ITorrentIndexerSettings
{
private static readonly HDBitsSettingsValidator Validator = new ();

7
src/NzbDrone.Core/Indexers/IPTorrents/IPTorrentsSettings.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text.RegularExpressions;
using Equ;
using FluentValidation;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
@ -25,9 +26,9 @@ namespace NzbDrone.Core.Indexers.IPTorrents
}
}
public class IPTorrentsSettings : ITorrentIndexerSettings
public class IPTorrentsSettings : PropertywiseEquatable<IPTorrentsSettings>, ITorrentIndexerSettings
{
private static readonly IPTorrentsSettingsValidator Validator = new IPTorrentsSettingsValidator();
private static readonly IPTorrentsSettingsValidator Validator = new ();
public IPTorrentsSettings()
{
@ -42,7 +43,7 @@ namespace NzbDrone.Core.Indexers.IPTorrents
public int MinimumSeeders { get; set; }
[FieldDefinition(2)]
public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings();
public SeedCriteriaSettings SeedCriteria { get; set; } = new ();
[FieldDefinition(3, Type = FieldType.Checkbox, Label = "IndexerSettingsRejectBlocklistedTorrentHashes", HelpText = "IndexerSettingsRejectBlocklistedTorrentHashesHelpText", Advanced = true)]
public bool RejectBlocklistedTorrentHashesWhileGrabbing { get; set; }

35
src/NzbDrone.Core/Indexers/IndexerDefinition.cs
View File

@ -1,9 +1,13 @@
using System;
using Equ;
using NzbDrone.Core.ThingiProvider;
namespace NzbDrone.Core.Indexers
{
public class IndexerDefinition : ProviderDefinition
public class IndexerDefinition : ProviderDefinition, IEquatable<IndexerDefinition>
{
private static readonly MemberwiseEqualityComparer<IndexerDefinition> Comparer = MemberwiseEqualityComparer<IndexerDefinition>.ByProperties;
public const int DefaultPriority = 25;
public IndexerDefinition()
@ -11,18 +15,41 @@ namespace NzbDrone.Core.Indexers
Priority = DefaultPriority;
}
[MemberwiseEqualityIgnore]
public DownloadProtocol Protocol { get; set; }
[MemberwiseEqualityIgnore]
public bool SupportsRss { get; set; }
[MemberwiseEqualityIgnore]
public bool SupportsSearch { get; set; }
public bool EnableRss { get; set; }
public bool EnableAutomaticSearch { get; set; }
public bool EnableInteractiveSearch { get; set; }
public int DownloadClientId { get; set; }
public DownloadProtocol Protocol { get; set; }
public bool SupportsRss { get; set; }
public bool SupportsSearch { get; set; }
public int Priority { get; set; }
public int SeasonSearchMaximumSingleEpisodeAge { get; set; }
[MemberwiseEqualityIgnore]
public override bool Enable => EnableRss || EnableAutomaticSearch || EnableInteractiveSearch;
[MemberwiseEqualityIgnore]
public IndexerStatus Status { get; set; }
public bool Equals(IndexerDefinition other)
{
return Comparer.Equals(this, other);
}
public override bool Equals(object obj)
{
return Equals(obj as IndexerDefinition);
}
public override int GetHashCode()
{
return Comparer.GetHashCode(this);
}
}
}

7
src/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs
View File

@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using Equ;
using FluentValidation;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
@ -28,7 +29,7 @@ namespace NzbDrone.Core.Indexers.Newznab
return settings.BaseUrl != null && ApiKeyWhiteList.Any(c => settings.BaseUrl.ToLowerInvariant().Contains(c));
}
private static readonly Regex AdditionalParametersRegex = new Regex(@"(&.+?\=.+?)+", RegexOptions.Compiled);
private static readonly Regex AdditionalParametersRegex = new (@"(&.+?\=.+?)+", RegexOptions.Compiled);
public NewznabSettingsValidator()
{
@ -48,9 +49,9 @@ namespace NzbDrone.Core.Indexers.Newznab
}
}
public class NewznabSettings : IIndexerSettings
public class NewznabSettings : PropertywiseEquatable<NewznabSettings>, IIndexerSettings
{
private static readonly NewznabSettingsValidator Validator = new NewznabSettingsValidator();
private static readonly NewznabSettingsValidator Validator = new ();
public NewznabSettings()
{

7
src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text.RegularExpressions;
using Equ;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Languages;
@ -19,9 +20,9 @@ namespace NzbDrone.Core.Indexers.Nyaa
}
}
public class NyaaSettings : ITorrentIndexerSettings
public class NyaaSettings : PropertywiseEquatable<NyaaSettings>, ITorrentIndexerSettings
{
private static readonly NyaaSettingsValidator Validator = new NyaaSettingsValidator();
private static readonly NyaaSettingsValidator Validator = new ();
public NyaaSettings()
{
@ -44,7 +45,7 @@ namespace NzbDrone.Core.Indexers.Nyaa
public int MinimumSeeders { get; set; }
[FieldDefinition(4)]
public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings();
public SeedCriteriaSettings SeedCriteria { get; set; } = new ();
[FieldDefinition(5, Type = FieldType.Checkbox, Label = "IndexerSettingsRejectBlocklistedTorrentHashes", HelpText = "IndexerSettingsRejectBlocklistedTorrentHashesHelpText", Advanced = true)]
public bool RejectBlocklistedTorrentHashesWhileGrabbing { get; set; }

3
src/NzbDrone.Core/Indexers/SeedCriteriaSettings.cs
View File

@ -1,3 +1,4 @@
using Equ;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Validation;
@ -46,7 +47,7 @@ namespace NzbDrone.Core.Indexers
}
}
public class SeedCriteriaSettings
public class SeedCriteriaSettings : PropertywiseEquatable<SeedCriteriaSettings>
{
[FieldDefinition(0, Type = FieldType.Number, Label = "IndexerSettingsSeedRatio", HelpText = "IndexerSettingsSeedRatioHelpText")]
public double? SeedRatio { get; set; }

7
src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssIndexerSettings.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using Equ;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Languages;
@ -17,9 +18,9 @@ namespace NzbDrone.Core.Indexers.TorrentRss
}
}
public class TorrentRssIndexerSettings : ITorrentIndexerSettings
public class TorrentRssIndexerSettings : PropertywiseEquatable<TorrentRssIndexerSettings>, ITorrentIndexerSettings
{
private static readonly TorrentRssIndexerSettingsValidator Validator = new TorrentRssIndexerSettingsValidator();
private static readonly TorrentRssIndexerSettingsValidator Validator = new ();
public TorrentRssIndexerSettings()
{
@ -42,7 +43,7 @@ namespace NzbDrone.Core.Indexers.TorrentRss
public int MinimumSeeders { get; set; }
[FieldDefinition(4)]
public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings();
public SeedCriteriaSettings SeedCriteria { get; set; } = new ();
[FieldDefinition(5, Type = FieldType.Checkbox, Label = "IndexerSettingsRejectBlocklistedTorrentHashes", HelpText = "IndexerSettingsRejectBlocklistedTorrentHashesHelpText", Advanced = true)]
public bool RejectBlocklistedTorrentHashesWhileGrabbing { get; set; }

7
src/NzbDrone.Core/Indexers/Torrentleech/TorrentleechSettings.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using Equ;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Languages;
@ -18,9 +19,9 @@ namespace NzbDrone.Core.Indexers.Torrentleech
}
}
public class TorrentleechSettings : ITorrentIndexerSettings
public class TorrentleechSettings : PropertywiseEquatable<TorrentleechSettings>, ITorrentIndexerSettings
{
private static readonly TorrentleechSettingsValidator Validator = new TorrentleechSettingsValidator();
private static readonly TorrentleechSettingsValidator Validator = new ();
public TorrentleechSettings()
{
@ -39,7 +40,7 @@ namespace NzbDrone.Core.Indexers.Torrentleech
public int MinimumSeeders { get; set; }
[FieldDefinition(3)]
public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings();
public SeedCriteriaSettings SeedCriteria { get; set; } = new ();
[FieldDefinition(4, Type = FieldType.Checkbox, Label = "IndexerSettingsRejectBlocklistedTorrentHashes", HelpText = "IndexerSettingsRejectBlocklistedTorrentHashesHelpText", Advanced = true)]
public bool RejectBlocklistedTorrentHashesWhileGrabbing { get; set; }

26
src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Linq;
using System.Text.RegularExpressions;
using Equ;
using FluentValidation;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
@ -18,7 +19,7 @@ namespace NzbDrone.Core.Indexers.Torznab
return settings.BaseUrl != null && ApiKeyWhiteList.Any(c => settings.BaseUrl.ToLowerInvariant().Contains(c));
}
private static readonly Regex AdditionalParametersRegex = new Regex(@"(&.+?\=.+?)+", RegexOptions.Compiled);
private static readonly Regex AdditionalParametersRegex = new (@"(&.+?\=.+?)+", RegexOptions.Compiled);
public TorznabSettingsValidator()
{
@ -40,9 +41,11 @@ namespace NzbDrone.Core.Indexers.Torznab
}
}
public class TorznabSettings : NewznabSettings, ITorrentIndexerSettings
public class TorznabSettings : NewznabSettings, ITorrentIndexerSettings, IEquatable<TorznabSettings>
{
private static readonly TorznabSettingsValidator Validator = new TorznabSettingsValidator();
private static readonly TorznabSettingsValidator Validator = new ();
private static readonly MemberwiseEqualityComparer<TorznabSettings> Comparer = MemberwiseEqualityComparer<TorznabSettings>.ByProperties;
public TorznabSettings()
{
@ -53,7 +56,7 @@ namespace NzbDrone.Core.Indexers.Torznab
public int MinimumSeeders { get; set; }
[FieldDefinition(9)]
public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings();
public SeedCriteriaSettings SeedCriteria { get; set; } = new ();
[FieldDefinition(10, Type = FieldType.Checkbox, Label = "IndexerSettingsRejectBlocklistedTorrentHashes", HelpText = "IndexerSettingsRejectBlocklistedTorrentHashesHelpText", Advanced = true)]
public bool RejectBlocklistedTorrentHashesWhileGrabbing { get; set; }
@ -62,5 +65,20 @@ namespace NzbDrone.Core.Indexers.Torznab
{
return new NzbDroneValidationResult(Validator.Validate(this));
}
public bool Equals(TorznabSettings other)
{
return Comparer.Equals(this, other);
}
public override bool Equals(object obj)
{
return Equals(obj as TorznabSettings);
}
public override int GetHashCode()
{
return Comparer.GetHashCode(this);
}
}
}

5
src/NzbDrone.Core/Notifications/Apprise/AppriseSettings.cs
View File

@ -3,7 +3,6 @@ using System.Collections.Generic;
using FluentValidation;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Apprise
@ -35,7 +34,7 @@ namespace NzbDrone.Core.Notifications.Apprise
}
}
public class AppriseSettings : IProviderConfig
public class AppriseSettings : NotificationSettingsBase<AppriseSettings>
{
private static readonly AppriseSettingsValidator Validator = new ();
@ -66,7 +65,7 @@ namespace NzbDrone.Core.Notifications.Apprise
[FieldDefinition(7, Label = "Password", Type = FieldType.Password, HelpText = "NotificationsAppriseSettingsPasswordHelpText", Privacy = PrivacyLevel.Password)]
public string AuthPassword { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

9
src/NzbDrone.Core/Notifications/CustomScript/CustomScriptSettings.cs
View File

@ -1,6 +1,5 @@
using FluentValidation;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
using NzbDrone.Core.Validation.Paths;
@ -16,9 +15,9 @@ namespace NzbDrone.Core.Notifications.CustomScript
}
}
public class CustomScriptSettings : IProviderConfig
public class CustomScriptSettings : NotificationSettingsBase<CustomScriptSettings>
{
private static readonly CustomScriptSettingsValidator Validator = new CustomScriptSettingsValidator();
private static readonly CustomScriptSettingsValidator Validator = new ();
[FieldDefinition(0, Label = "Path", Type = FieldType.FilePath)]
public string Path { get; set; }
@ -26,7 +25,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
[FieldDefinition(1, Label = "NotificationsCustomScriptSettingsArguments", HelpText = "NotificationsCustomScriptSettingsArgumentsHelpText", Hidden = HiddenType.HiddenIfNotSet)]
public string Arguments { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

5
src/NzbDrone.Core/Notifications/Discord/DiscordSettings.cs
View File

@ -1,7 +1,6 @@
using System.Collections.Generic;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Discord
@ -14,7 +13,7 @@ namespace NzbDrone.Core.Notifications.Discord
}
}
public class DiscordSettings : IProviderConfig
public class DiscordSettings : NotificationSettingsBase<DiscordSettings>
{
public DiscordSettings()
{
@ -89,7 +88,7 @@ namespace NzbDrone.Core.Notifications.Discord
[FieldDefinition(6, Label = "NotificationsDiscordSettingsOnManualInteractionFields", Advanced = true, SelectOptions = typeof(DiscordManualInteractionFieldType), HelpText = "NotificationsDiscordSettingsOnManualInteractionFieldsHelpText", Type = FieldType.Select)]
public IEnumerable<int> ManualInteractionFields { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Notifications/Email/EmailSettings.cs
View File

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Email
@ -26,9 +25,9 @@ namespace NzbDrone.Core.Notifications.Email
}
}
public class EmailSettings : IProviderConfig
public class EmailSettings : NotificationSettingsBase<EmailSettings>
{
private static readonly EmailSettingsValidator Validator = new EmailSettingsValidator();
private static readonly EmailSettingsValidator Validator = new ();
public EmailSettings()
{
@ -66,7 +65,7 @@ namespace NzbDrone.Core.Notifications.Email
[FieldDefinition(8, Label = "NotificationsEmailSettingsBccAddress", HelpText = "NotificationsEmailSettingsBccAddressHelpText", Advanced = true)]
public IEnumerable<string> Bcc { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Notifications/Gotify/GotifySettings.cs
View File

@ -1,6 +1,5 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Gotify
@ -14,9 +13,9 @@ namespace NzbDrone.Core.Notifications.Gotify
}
}
public class GotifySettings : IProviderConfig
public class GotifySettings : NotificationSettingsBase<GotifySettings>
{
private static readonly GotifySettingsValidator Validator = new GotifySettingsValidator();
private static readonly GotifySettingsValidator Validator = new ();
public GotifySettings()
{
@ -35,7 +34,7 @@ namespace NzbDrone.Core.Notifications.Gotify
[FieldDefinition(3, Label = "NotificationsGotifySettingIncludeSeriesPoster", Type = FieldType.Checkbox, HelpText = "NotificationsGotifySettingIncludeSeriesPosterHelpText")]
public bool IncludeSeriesPoster { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

9
src/NzbDrone.Core/Notifications/Join/JoinSettings.cs
View File

@ -1,6 +1,5 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Join
@ -14,15 +13,15 @@ namespace NzbDrone.Core.Notifications.Join
}
}
public class JoinSettings : IProviderConfig
public class JoinSettings : NotificationSettingsBase<JoinSettings>
{
private static readonly JoinSettingsValidator Validator = new ();
public JoinSettings()
{
Priority = (int)JoinPriority.Normal;
}
private static readonly JoinSettingsValidator Validator = new JoinSettingsValidator();
[FieldDefinition(0, Label = "ApiKey", HelpText = "NotificationsJoinSettingsApiKeyHelpText", HelpLink = "https://joinjoaomgcd.appspot.com/")]
public string ApiKey { get; set; }
@ -35,7 +34,7 @@ namespace NzbDrone.Core.Notifications.Join
[FieldDefinition(3, Label = "NotificationsJoinSettingsNotificationPriority", Type = FieldType.Select, SelectOptions = typeof(JoinPriority))]
public int Priority { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Notifications/Mailgun/MailgunSettings.cs
View File

@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Mailgun
@ -17,9 +16,9 @@ namespace NzbDrone.Core.Notifications.Mailgun
}
}
public class MailgunSettings : IProviderConfig
public class MailgunSettings : NotificationSettingsBase<MailgunSettings>
{
private static readonly MailGunSettingsValidator Validator = new MailGunSettingsValidator();
private static readonly MailGunSettingsValidator Validator = new ();
public MailgunSettings()
{
@ -41,7 +40,7 @@ namespace NzbDrone.Core.Notifications.Mailgun
[FieldDefinition(4, Label = "NotificationsEmailSettingsRecipientAddress", Type = FieldType.Tag)]
public IEnumerable<string> Recipients { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserSettings.cs
View File

@ -2,7 +2,6 @@ using FluentValidation;
using Newtonsoft.Json;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Emby
@ -19,9 +18,9 @@ namespace NzbDrone.Core.Notifications.Emby
}
}
public class MediaBrowserSettings : IProviderConfig
public class MediaBrowserSettings : NotificationSettingsBase<MediaBrowserSettings>
{
private static readonly MediaBrowserSettingsValidator Validator = new MediaBrowserSettingsValidator();
private static readonly MediaBrowserSettingsValidator Validator = new ();
public MediaBrowserSettings()
{
@ -65,7 +64,7 @@ namespace NzbDrone.Core.Notifications.Emby
public bool IsValid => !string.IsNullOrWhiteSpace(Host) && Port > 0;
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Notifications/Notifiarr/NotifiarrSettings.cs
View File

@ -1,6 +1,5 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Notifiarr
@ -13,14 +12,14 @@ namespace NzbDrone.Core.Notifications.Notifiarr
}
}
public class NotifiarrSettings : IProviderConfig
public class NotifiarrSettings : NotificationSettingsBase<NotifiarrSettings>
{
private static readonly NotifiarrSettingsValidator Validator = new NotifiarrSettingsValidator();
private static readonly NotifiarrSettingsValidator Validator = new ();
[FieldDefinition(0, Label = "ApiKey", Privacy = PrivacyLevel.ApiKey, HelpText = "NotificationsNotifiarrSettingsApiKeyHelpText", HelpLink = "https://notifiarr.com")]
public string ApiKey { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

2
src/NzbDrone.Core/Notifications/NotificationBase.cs
View File

@ -8,7 +8,7 @@ using NzbDrone.Core.Tv;
namespace NzbDrone.Core.Notifications
{
public abstract class NotificationBase<TSettings> : INotification
where TSettings : IProviderConfig, new()
where TSettings : NotificationSettingsBase<TSettings>, new()
{
protected const string EPISODE_GRABBED_TITLE = "Episode Grabbed";
protected const string EPISODE_DOWNLOADED_TITLE = "Episode Downloaded";

48
src/NzbDrone.Core/Notifications/NotificationDefinition.cs
View File

@ -1,9 +1,13 @@
using System;
using Equ;
using NzbDrone.Core.ThingiProvider;
namespace NzbDrone.Core.Notifications
{
public class NotificationDefinition : ProviderDefinition
public class NotificationDefinition : ProviderDefinition, IEquatable<NotificationDefinition>
{
private static readonly MemberwiseEqualityComparer<NotificationDefinition> Comparer = MemberwiseEqualityComparer<NotificationDefinition>.ByProperties;
public bool OnGrab { get; set; }
public bool OnDownload { get; set; }
public bool OnUpgrade { get; set; }
@ -13,23 +17,63 @@ namespace NzbDrone.Core.Notifications
public bool OnEpisodeFileDelete { get; set; }
public bool OnEpisodeFileDeleteForUpgrade { get; set; }
public bool OnHealthIssue { get; set; }
public bool IncludeHealthWarnings { get; set; }
public bool OnHealthRestored { get; set; }
public bool OnApplicationUpdate { get; set; }
public bool OnManualInteractionRequired { get; set; }
[MemberwiseEqualityIgnore]
public bool SupportsOnGrab { get; set; }
[MemberwiseEqualityIgnore]
public bool SupportsOnDownload { get; set; }
[MemberwiseEqualityIgnore]
public bool SupportsOnUpgrade { get; set; }
[MemberwiseEqualityIgnore]
public bool SupportsOnRename { get; set; }
[MemberwiseEqualityIgnore]
public bool SupportsOnSeriesAdd { get; set; }
[MemberwiseEqualityIgnore]
public bool SupportsOnSeriesDelete { get; set; }
[MemberwiseEqualityIgnore]
public bool SupportsOnEpisodeFileDelete { get; set; }
[MemberwiseEqualityIgnore]
public bool SupportsOnEpisodeFileDeleteForUpgrade { get; set; }
[MemberwiseEqualityIgnore]
public bool SupportsOnHealthIssue { get; set; }
[MemberwiseEqualityIgnore]
public bool SupportsOnHealthRestored { get; set; }
public bool IncludeHealthWarnings { get; set; }
[MemberwiseEqualityIgnore]
public bool SupportsOnApplicationUpdate { get; set; }
[MemberwiseEqualityIgnore]
public bool SupportsOnManualInteractionRequired { get; set; }
[MemberwiseEqualityIgnore]
public override bool Enable => OnGrab || OnDownload || (OnDownload && OnUpgrade) || OnRename || OnSeriesAdd || OnSeriesDelete || OnEpisodeFileDelete || (OnEpisodeFileDelete && OnEpisodeFileDeleteForUpgrade) || OnHealthIssue || OnHealthRestored || OnApplicationUpdate || OnManualInteractionRequired;
public bool Equals(NotificationDefinition other)
{
return Comparer.Equals(this, other);
}
public override bool Equals(object obj)
{
return Equals(obj as NotificationDefinition);
}
public override int GetHashCode()
{
return Comparer.GetHashCode(this);
}
}
}

30
src/NzbDrone.Core/Notifications/NotificationSettingsBase.cs Normal file
View File

@ -0,0 +1,30 @@
using System;
using Equ;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications
{
public abstract class NotificationSettingsBase<TSettings> : IProviderConfig, IEquatable<TSettings>
where TSettings : NotificationSettingsBase<TSettings>
{
private static readonly MemberwiseEqualityComparer<TSettings> Comparer = MemberwiseEqualityComparer<TSettings>.ByProperties;
public abstract NzbDroneValidationResult Validate();
public bool Equals(TSettings other)
{
return Comparer.Equals(this as TSettings, other);
}
public override bool Equals(object obj)
{
return Equals(obj as TSettings);
}
public override int GetHashCode()
{
return Comparer.GetHashCode(this as TSettings);
}
}
}

9
src/NzbDrone.Core/Notifications/Ntfy/NtfySettings.cs
View File

@ -3,7 +3,6 @@ using System.Collections.Generic;
using FluentValidation;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Ntfy
@ -21,12 +20,12 @@ namespace NzbDrone.Core.Notifications.Ntfy
RuleForEach(c => c.Topics).NotEmpty().Matches("[a-zA-Z0-9_-]+").Must(c => !InvalidTopics.Contains(c)).WithMessage("Invalid topic");
}
private static List<string> InvalidTopics => new List<string> { "announcements", "app", "docs", "settings", "stats", "mytopic-rw", "mytopic-ro", "mytopic-wo" };
private static List<string> InvalidTopics => new () { "announcements", "app", "docs", "settings", "stats", "mytopic-rw", "mytopic-ro", "mytopic-wo" };
}
public class NtfySettings : IProviderConfig
public class NtfySettings : NotificationSettingsBase<NtfySettings>
{
private static readonly NtfySettingsValidator Validator = new NtfySettingsValidator();
private static readonly NtfySettingsValidator Validator = new ();
public NtfySettings()
{
@ -59,7 +58,7 @@ namespace NzbDrone.Core.Notifications.Ntfy
[FieldDefinition(7, Label = "NotificationsNtfySettingsClickUrl", Type = FieldType.Url, HelpText = "NotificationsNtfySettingsClickUrlHelpText")]
public string ClickUrl { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Notifications/Plex/Server/PlexServerSettings.cs
View File

@ -1,7 +1,6 @@
using FluentValidation;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Plex.Server
@ -17,9 +16,9 @@ namespace NzbDrone.Core.Notifications.Plex.Server
}
}
public class PlexServerSettings : IProviderConfig
public class PlexServerSettings : NotificationSettingsBase<PlexServerSettings>
{
private static readonly PlexServerSettingsValidator Validator = new PlexServerSettingsValidator();
private static readonly PlexServerSettingsValidator Validator = new ();
public PlexServerSettings()
{
@ -62,7 +61,7 @@ namespace NzbDrone.Core.Notifications.Plex.Server
public bool IsValid => !string.IsNullOrWhiteSpace(Host);
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

9
src/NzbDrone.Core/Notifications/Prowl/ProwlSettings.cs
View File

@ -1,6 +1,5 @@
using FluentValidation;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Prowl
@ -13,9 +12,9 @@ namespace NzbDrone.Core.Notifications.Prowl
}
}
public class ProwlSettings : IProviderConfig
public class ProwlSettings : NotificationSettingsBase<ProwlSettings>
{
private static readonly ProwlSettingsValidator Validator = new ProwlSettingsValidator();
private static readonly ProwlSettingsValidator Validator = new ();
[FieldDefinition(0, Label = "ApiKey", Privacy = PrivacyLevel.ApiKey, HelpLink = "https://www.prowlapp.com/api_settings.php")]
public string ApiKey { get; set; }
@ -25,7 +24,7 @@ namespace NzbDrone.Core.Notifications.Prowl
public bool IsValid => !string.IsNullOrWhiteSpace(ApiKey) && Priority >= -2 && Priority <= 2;
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Notifications/PushBullet/PushBulletSettings.cs
View File

@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.PushBullet
@ -15,9 +14,9 @@ namespace NzbDrone.Core.Notifications.PushBullet
}
}
public class PushBulletSettings : IProviderConfig
public class PushBulletSettings : NotificationSettingsBase<PushBulletSettings>
{
private static readonly PushBulletSettingsValidator Validator = new PushBulletSettingsValidator();
private static readonly PushBulletSettingsValidator Validator = new ();
public PushBulletSettings()
{
@ -37,7 +36,7 @@ namespace NzbDrone.Core.Notifications.PushBullet
[FieldDefinition(3, Label = "NotificationsPushBulletSettingSenderId", HelpText = "NotificationsPushBulletSettingSenderIdHelpText")]
public string SenderId { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

5
src/NzbDrone.Core/Notifications/Pushcut/PushcutSettings.cs
View File

@ -1,6 +1,5 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Pushcut
@ -14,7 +13,7 @@ namespace NzbDrone.Core.Notifications.Pushcut
}
}
public class PushcutSettings : IProviderConfig
public class PushcutSettings : NotificationSettingsBase<PushcutSettings>
{
private static readonly PushcutSettingsValidator Validator = new ();
@ -27,7 +26,7 @@ namespace NzbDrone.Core.Notifications.Pushcut
[FieldDefinition(2, Label = "NotificationsPushcutSettingsTimeSensitive", Type = FieldType.Checkbox, HelpText = "NotificationsPushcutSettingsTimeSensitiveHelpText")]
public bool TimeSensitive { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Notifications/Pushover/PushoverSettings.cs
View File

@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Pushover
@ -17,9 +16,9 @@ namespace NzbDrone.Core.Notifications.Pushover
}
}
public class PushoverSettings : IProviderConfig
public class PushoverSettings : NotificationSettingsBase<PushoverSettings>
{
private static readonly PushoverSettingsValidator Validator = new PushoverSettingsValidator();
private static readonly PushoverSettingsValidator Validator = new ();
public PushoverSettings()
{
@ -51,7 +50,7 @@ namespace NzbDrone.Core.Notifications.Pushover
public bool IsValid => !string.IsNullOrWhiteSpace(UserKey) && Priority >= -1 && Priority <= 2;
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

9
src/NzbDrone.Core/Notifications/SendGrid/SendGridSettings.cs
View File

@ -1,8 +1,7 @@
using System;
using System;
using System.Collections.Generic;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.SendGrid
@ -18,9 +17,9 @@ namespace NzbDrone.Core.Notifications.SendGrid
}
}
public class SendGridSettings : IProviderConfig
public class SendGridSettings : NotificationSettingsBase<SendGridSettings>
{
private static readonly SendGridSettingsValidator Validator = new SendGridSettingsValidator();
private static readonly SendGridSettingsValidator Validator = new ();
public SendGridSettings()
{
@ -39,7 +38,7 @@ namespace NzbDrone.Core.Notifications.SendGrid
[FieldDefinition(3, Label = "NotificationsEmailSettingsRecipientAddress", Type = FieldType.Tag)]
public IEnumerable<string> Recipients { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

5
src/NzbDrone.Core/Notifications/Signal/SignalSettings.cs
View File

@ -1,6 +1,5 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Signal
@ -16,7 +15,7 @@ namespace NzbDrone.Core.Notifications.Signal
}
}
public class SignalSettings : IProviderConfig
public class SignalSettings : NotificationSettingsBase<SignalSettings>
{
private static readonly SignalSettingsValidator Validator = new ();
@ -42,7 +41,7 @@ namespace NzbDrone.Core.Notifications.Signal
[FieldDefinition(6, Label = "Password", Type = FieldType.Password, Privacy = PrivacyLevel.Password, HelpText = "NotificationsSignalSettingsPasswordHelpText")]
public string AuthPassword { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Notifications/Simplepush/SimplepushSettings.cs
View File

@ -1,6 +1,5 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Simplepush
@ -13,9 +12,9 @@ namespace NzbDrone.Core.Notifications.Simplepush
}
}
public class SimplepushSettings : IProviderConfig
public class SimplepushSettings : NotificationSettingsBase<SimplepushSettings>
{
private static readonly SimplepushSettingsValidator Validator = new SimplepushSettingsValidator();
private static readonly SimplepushSettingsValidator Validator = new ();
[FieldDefinition(0, Label = "NotificationsSimplepushSettingsKey", Privacy = PrivacyLevel.ApiKey, HelpLink = "https://simplepush.io/features")]
public string Key { get; set; }
@ -25,7 +24,7 @@ namespace NzbDrone.Core.Notifications.Simplepush
public bool IsValid => !string.IsNullOrWhiteSpace(Key);
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Notifications/Slack/SlackSettings.cs
View File

@ -1,6 +1,5 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Slack
@ -14,9 +13,9 @@ namespace NzbDrone.Core.Notifications.Slack
}
}
public class SlackSettings : IProviderConfig
public class SlackSettings : NotificationSettingsBase<SlackSettings>
{
private static readonly SlackSettingsValidator Validator = new SlackSettingsValidator();
private static readonly SlackSettingsValidator Validator = new ();
[FieldDefinition(0, Label = "NotificationsSettingsWebhookUrl", HelpText = "NotificationsSlackSettingsWebhookUrlHelpText", Type = FieldType.Url, HelpLink = "https://my.slack.com/services/new/incoming-webhook/")]
public string WebHookUrl { get; set; }
@ -30,7 +29,7 @@ namespace NzbDrone.Core.Notifications.Slack
[FieldDefinition(3, Label = "NotificationsSlackSettingsChannel", HelpText = "NotificationsSlackSettingsChannelHelpText", Type = FieldType.Textbox)]
public string Channel { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Notifications/Synology/SynologyIndexerSettings.cs
View File

@ -1,6 +1,5 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Synology
@ -9,9 +8,9 @@ namespace NzbDrone.Core.Notifications.Synology
{
}
public class SynologyIndexerSettings : IProviderConfig
public class SynologyIndexerSettings : NotificationSettingsBase<SynologyIndexerSettings>
{
private static readonly SynologyIndexerSettingsValidator Validator = new SynologyIndexerSettingsValidator();
private static readonly SynologyIndexerSettingsValidator Validator = new ();
public SynologyIndexerSettings()
{
@ -21,7 +20,7 @@ namespace NzbDrone.Core.Notifications.Synology
[FieldDefinition(0, Label = "NotificationsSettingsUpdateLibrary", Type = FieldType.Checkbox, HelpText = "NotificationsSynologySettingsUpdateLibraryHelpText")]
public bool UpdateLibrary { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Notifications/Telegram/TelegramSettings.cs
View File

@ -1,6 +1,5 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Telegram
@ -16,9 +15,9 @@ namespace NzbDrone.Core.Notifications.Telegram
}
}
public class TelegramSettings : IProviderConfig
public class TelegramSettings : NotificationSettingsBase<TelegramSettings>
{
private static readonly TelegramSettingsValidator Validator = new TelegramSettingsValidator();
private static readonly TelegramSettingsValidator Validator = new ();
[FieldDefinition(0, Label = "NotificationsTelegramSettingsBotToken", Privacy = PrivacyLevel.ApiKey, HelpLink = "https://core.telegram.org/bots")]
public string BotToken { get; set; }
@ -35,7 +34,7 @@ namespace NzbDrone.Core.Notifications.Telegram
[FieldDefinition(4, Label = "NotificationsTelegramSettingsIncludeAppName", Type = FieldType.Checkbox, HelpText = "NotificationsTelegramSettingsIncludeAppNameHelpText")]
public bool IncludeAppNameInTitle { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

7
src/NzbDrone.Core/Notifications/Trakt/TraktSettings.cs
View File

@ -1,7 +1,6 @@
using System;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Trakt
@ -16,9 +15,9 @@ namespace NzbDrone.Core.Notifications.Trakt
}
}
public class TraktSettings : IProviderConfig
public class TraktSettings : NotificationSettingsBase<TraktSettings>
{
private static readonly TraktSettingsValidator Validator = new TraktSettingsValidator();
private static readonly TraktSettingsValidator Validator = new ();
public TraktSettings()
{
@ -40,7 +39,7 @@ namespace NzbDrone.Core.Notifications.Trakt
[FieldDefinition(4, Label = "NotificationsTraktSettingsAuthenticateWithTrakt", Type = FieldType.OAuth)]
public string SignIn { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

9
src/NzbDrone.Core/Notifications/Twitter/TwitterSettings.cs
View File

@ -1,7 +1,6 @@
using FluentValidation;
using FluentValidation;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Twitter
@ -28,9 +27,9 @@ namespace NzbDrone.Core.Notifications.Twitter
}
}
public class TwitterSettings : IProviderConfig
public class TwitterSettings : NotificationSettingsBase<TwitterSettings>
{
private static readonly TwitterSettingsValidator Validator = new TwitterSettingsValidator();
private static readonly TwitterSettingsValidator Validator = new ();
public TwitterSettings()
{
@ -59,7 +58,7 @@ namespace NzbDrone.Core.Notifications.Twitter
[FieldDefinition(6, Label = "NotificationsTwitterSettingsConnectToTwitter", Type = FieldType.OAuth)]
public string AuthorizeNotification { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

3
src/NzbDrone.Core/Notifications/Webhook/WebhookBase.cs
View File

@ -6,13 +6,12 @@ using NzbDrone.Core.Configuration;
using NzbDrone.Core.Localization;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.Tags;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Tv;
namespace NzbDrone.Core.Notifications.Webhook
{
public abstract class WebhookBase<TSettings> : NotificationBase<TSettings>
where TSettings : IProviderConfig, new()
where TSettings : NotificationSettingsBase<TSettings>, new()
{
private readonly IConfigFileProvider _configFileProvider;
private readonly IConfigService _configService;

9
src/NzbDrone.Core/Notifications/Webhook/WebhookSettings.cs
View File

@ -1,7 +1,6 @@
using System;
using System;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Webhook
@ -14,9 +13,9 @@ namespace NzbDrone.Core.Notifications.Webhook
}
}
public class WebhookSettings : IProviderConfig
public class WebhookSettings : NotificationSettingsBase<WebhookSettings>
{
private static readonly WebhookSettingsValidator Validator = new WebhookSettingsValidator();
private static readonly WebhookSettingsValidator Validator = new ();
public WebhookSettings()
{
@ -35,7 +34,7 @@ namespace NzbDrone.Core.Notifications.Webhook
[FieldDefinition(3, Label = "Password", Type = FieldType.Password, Privacy = PrivacyLevel.Password)]
public string Password { get; set; }
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

5
src/NzbDrone.Core/Notifications/Xbmc/XbmcSettings.cs
View File

@ -3,7 +3,6 @@ using FluentValidation;
using Newtonsoft.Json;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Xbmc
@ -18,7 +17,7 @@ namespace NzbDrone.Core.Notifications.Xbmc
}
}
public class XbmcSettings : IProviderConfig
public class XbmcSettings : NotificationSettingsBase<XbmcSettings>
{
private static readonly XbmcSettingsValidator Validator = new ();
@ -69,7 +68,7 @@ namespace NzbDrone.Core.Notifications.Xbmc
[JsonIgnore]
public string Address => $"{Host.ToUrlHost()}:{Port}{UrlBase}";
public NzbDroneValidationResult Validate()
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}

3
src/NzbDrone.Core/Sonarr.Core.csproj
View File

@ -1,10 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dapper" Version="2.0.123" />
<PackageReference Include="Diacritical.Net" Version="1.0.4" />
<PackageReference Include="Equ" Version="2.3.0" />
<PackageReference Include="MailKit" Version="3.6.0" />
<PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="6.0.21" />
<PackageReference Include="Polly" Version="8.3.1" />

11
src/NzbDrone.Core/ThingiProvider/ProviderDefinition.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Text.Json.Serialization;
using Equ;
using NzbDrone.Core.Datastore;
namespace NzbDrone.Core.ThingiProvider
@ -16,20 +17,22 @@ namespace NzbDrone.Core.ThingiProvider
public string Name { get; set; }
[JsonIgnore]
[MemberwiseEqualityIgnore]
public string ImplementationName { get; set; }
public string Implementation { get; set; }
public string ConfigContract { get; set; }
public virtual bool Enable { get; set; }
[MemberwiseEqualityIgnore]
public ProviderMessage Message { get; set; }
public HashSet<int> Tags { get; set; }
[MemberwiseEqualityIgnore]
public IProviderConfig Settings
{
get
{
return _settings;
}
get => _settings;
set
{
_settings = value;

6
src/Sonarr.Api.V3/Notifications/NotificationResource.cs
View File

@ -14,6 +14,7 @@ namespace Sonarr.Api.V3.Notifications
public bool OnEpisodeFileDelete { get; set; }
public bool OnEpisodeFileDeleteForUpgrade { get; set; }
public bool OnHealthIssue { get; set; }
public bool IncludeHealthWarnings { get; set; }
public bool OnHealthRestored { get; set; }
public bool OnApplicationUpdate { get; set; }
public bool OnManualInteractionRequired { get; set; }
@ -29,7 +30,6 @@ namespace Sonarr.Api.V3.Notifications
public bool SupportsOnHealthRestored { get; set; }
public bool SupportsOnApplicationUpdate { get; set; }
public bool SupportsOnManualInteractionRequired { get; set; }
public bool IncludeHealthWarnings { get; set; }
public string TestCommand { get; set; }
}
@ -53,6 +53,7 @@ namespace Sonarr.Api.V3.Notifications
resource.OnEpisodeFileDelete = definition.OnEpisodeFileDelete;
resource.OnEpisodeFileDeleteForUpgrade = definition.OnEpisodeFileDeleteForUpgrade;
resource.OnHealthIssue = definition.OnHealthIssue;
resource.IncludeHealthWarnings = definition.IncludeHealthWarnings;
resource.OnHealthRestored = definition.OnHealthRestored;
resource.OnApplicationUpdate = definition.OnApplicationUpdate;
resource.OnManualInteractionRequired = definition.OnManualInteractionRequired;
@ -66,7 +67,6 @@ namespace Sonarr.Api.V3.Notifications
resource.SupportsOnEpisodeFileDeleteForUpgrade = definition.SupportsOnEpisodeFileDeleteForUpgrade;
resource.SupportsOnHealthIssue = definition.SupportsOnHealthIssue;
resource.SupportsOnHealthRestored = definition.SupportsOnHealthRestored;
resource.IncludeHealthWarnings = definition.IncludeHealthWarnings;
resource.SupportsOnApplicationUpdate = definition.SupportsOnApplicationUpdate;
resource.SupportsOnManualInteractionRequired = definition.SupportsOnManualInteractionRequired;
@ -91,6 +91,7 @@ namespace Sonarr.Api.V3.Notifications
definition.OnEpisodeFileDelete = resource.OnEpisodeFileDelete;
definition.OnEpisodeFileDeleteForUpgrade = resource.OnEpisodeFileDeleteForUpgrade;
definition.OnHealthIssue = resource.OnHealthIssue;
definition.IncludeHealthWarnings = resource.IncludeHealthWarnings;
definition.OnHealthRestored = resource.OnHealthRestored;
definition.OnApplicationUpdate = resource.OnApplicationUpdate;
definition.OnManualInteractionRequired = resource.OnManualInteractionRequired;
@ -104,7 +105,6 @@ namespace Sonarr.Api.V3.Notifications
definition.SupportsOnEpisodeFileDeleteForUpgrade = resource.SupportsOnEpisodeFileDeleteForUpgrade;
definition.SupportsOnHealthIssue = resource.SupportsOnHealthIssue;
definition.SupportsOnHealthRestored = resource.SupportsOnHealthRestored;
definition.IncludeHealthWarnings = resource.IncludeHealthWarnings;
definition.SupportsOnApplicationUpdate = resource.SupportsOnApplicationUpdate;
definition.SupportsOnManualInteractionRequired = resource.SupportsOnManualInteractionRequired;

4
src/Sonarr.Api.V3/ProviderControllerBase.cs
View File

@ -90,10 +90,8 @@ namespace Sonarr.Api.V3
var existingDefinition = _providerFactory.Find(providerResource.Id);
var providerDefinition = GetDefinition(providerResource, existingDefinition, true, !forceSave, false);
// Comparing via JSON string to eliminate the need for every provider implementation to implement equality checks.
// Compare settings separately because they are not serialized with the definition.
var hasDefinitionChanged = STJson.ToJson(existingDefinition) != STJson.ToJson(providerDefinition) ||
STJson.ToJson(existingDefinition.Settings) != STJson.ToJson(providerDefinition.Settings);
var hasDefinitionChanged = !existingDefinition.Equals(providerDefinition) || !existingDefinition.Settings.Equals(providerDefinition.Settings);
// Only test existing definitions if it is enabled and forceSave isn't set and the definition has changed.
if (providerDefinition.Enable && !forceSave && hasDefinitionChanged)