From 68ea6fbb4fcb0179b7b8353d720b7a38f8df4603 Mon Sep 17 00:00:00 2001 From: Qstick Date: Mon, 6 Jan 2020 22:02:41 -0500 Subject: [PATCH] Fixed: Broken SeedConfigOptions due to System.Text.Json req. for public setters --- src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs | 2 +- src/NzbDrone.Core/Indexers/HDBits/HDBitsSettings.cs | 2 +- src/NzbDrone.Core/Indexers/IPTorrents/IPTorrentsSettings.cs | 2 +- src/NzbDrone.Core/Indexers/ITorrentIndexerSettings.cs | 4 +++- src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs | 2 +- .../Indexers/PassThePopcorn/PassThePopcornSettings.cs | 2 +- src/NzbDrone.Core/Indexers/Rarbg/RarbgSettings.cs | 2 +- .../Indexers/TorrentPotato/TorrentPotatoSettings.cs | 2 +- .../Indexers/TorrentRss/TorrentRssIndexerSettings.cs | 2 +- src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs | 2 +- 10 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs b/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs index 534bb4a10..ba5b23b64 100644 --- a/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs +++ b/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs @@ -44,7 +44,7 @@ namespace NzbDrone.Core.Indexers.AwesomeHD public IEnumerable RequiredFlags { get; set; } [FieldDefinition(5)] - public SeedCriteriaSettings SeedCriteria { get; } = new SeedCriteriaSettings(); + public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings(); public NzbDroneValidationResult Validate() { diff --git a/src/NzbDrone.Core/Indexers/HDBits/HDBitsSettings.cs b/src/NzbDrone.Core/Indexers/HDBits/HDBitsSettings.cs index 82cea616b..0d5d8af3d 100644 --- a/src/NzbDrone.Core/Indexers/HDBits/HDBitsSettings.cs +++ b/src/NzbDrone.Core/Indexers/HDBits/HDBitsSettings.cs @@ -60,7 +60,7 @@ namespace NzbDrone.Core.Indexers.HDBits public IEnumerable RequiredFlags { get; set; } [FieldDefinition(9)] - public SeedCriteriaSettings SeedCriteria { get; } = new SeedCriteriaSettings(); + public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings(); public NzbDroneValidationResult Validate() { diff --git a/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrentsSettings.cs b/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrentsSettings.cs index 612393fac..27e942d0c 100644 --- a/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrentsSettings.cs +++ b/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrentsSettings.cs @@ -48,7 +48,7 @@ namespace NzbDrone.Core.Indexers.IPTorrents public IEnumerable RequiredFlags { get; set; } [FieldDefinition(4)] - public SeedCriteriaSettings SeedCriteria { get; } = new SeedCriteriaSettings(); + public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings(); public NzbDroneValidationResult Validate() { diff --git a/src/NzbDrone.Core/Indexers/ITorrentIndexerSettings.cs b/src/NzbDrone.Core/Indexers/ITorrentIndexerSettings.cs index 5db99fa7e..7fa23251e 100644 --- a/src/NzbDrone.Core/Indexers/ITorrentIndexerSettings.cs +++ b/src/NzbDrone.Core/Indexers/ITorrentIndexerSettings.cs @@ -6,6 +6,8 @@ namespace NzbDrone.Core.Indexers { int MinimumSeeders { get; set; } IEnumerable RequiredFlags { get; set; } - SeedCriteriaSettings SeedCriteria { get; } + + // TODO: System.Text.Json requires setter be public for sub-object deserialization in 3.0. https://github.com/dotnet/corefx/issues/42515 + SeedCriteriaSettings SeedCriteria { get; set; } } } diff --git a/src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs b/src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs index c1eae6680..a7810a34d 100644 --- a/src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs +++ b/src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs @@ -46,7 +46,7 @@ namespace NzbDrone.Core.Indexers.Nyaa public IEnumerable RequiredFlags { get; set; } [FieldDefinition(5)] - public SeedCriteriaSettings SeedCriteria { get; } = new SeedCriteriaSettings(); + public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings(); public NzbDroneValidationResult Validate() { diff --git a/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornSettings.cs b/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornSettings.cs index bf92a4066..559b3f40e 100644 --- a/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornSettings.cs +++ b/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornSettings.cs @@ -45,7 +45,7 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn public int MinimumSeeders { get; set; } [FieldDefinition(5)] - public SeedCriteriaSettings SeedCriteria { get; } = new SeedCriteriaSettings(); + public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings(); // [FieldDefinition(6, Type = FieldType.Tag, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://github.com/Radarr/Radarr/wiki/Indexer-Flags#1-required-flags", Advanced = true)] public IEnumerable RequiredFlags { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Rarbg/RarbgSettings.cs b/src/NzbDrone.Core/Indexers/Rarbg/RarbgSettings.cs index f47feefe4..237b6b065 100644 --- a/src/NzbDrone.Core/Indexers/Rarbg/RarbgSettings.cs +++ b/src/NzbDrone.Core/Indexers/Rarbg/RarbgSettings.cs @@ -53,7 +53,7 @@ namespace NzbDrone.Core.Indexers.Rarbg public IEnumerable Categories { get; set; } [FieldDefinition(7)] - public SeedCriteriaSettings SeedCriteria { get; } = new SeedCriteriaSettings(); + public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings(); public NzbDroneValidationResult Validate() { diff --git a/src/NzbDrone.Core/Indexers/TorrentPotato/TorrentPotatoSettings.cs b/src/NzbDrone.Core/Indexers/TorrentPotato/TorrentPotatoSettings.cs index dded701fd..dd840ac1a 100644 --- a/src/NzbDrone.Core/Indexers/TorrentPotato/TorrentPotatoSettings.cs +++ b/src/NzbDrone.Core/Indexers/TorrentPotato/TorrentPotatoSettings.cs @@ -43,7 +43,7 @@ namespace NzbDrone.Core.Indexers.TorrentPotato public int MinimumSeeders { get; set; } [FieldDefinition(5)] - public SeedCriteriaSettings SeedCriteria { get; } = new SeedCriteriaSettings(); + public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings(); // [FieldDefinition(6, Type = FieldType.Tag, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", Advanced = true)] public IEnumerable RequiredFlags { get; set; } diff --git a/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssIndexerSettings.cs b/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssIndexerSettings.cs index 5103d5c6d..e1e6fbd12 100644 --- a/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssIndexerSettings.cs +++ b/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssIndexerSettings.cs @@ -44,7 +44,7 @@ namespace NzbDrone.Core.Indexers.TorrentRss public int MinimumSeeders { get; set; } [FieldDefinition(5)] - public SeedCriteriaSettings SeedCriteria { get; } = new SeedCriteriaSettings(); + public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings(); // [FieldDefinition(6, Type = FieldType.Tag, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://github.com/Radarr/Radarr/wiki/Indexer-Flags#1-required-flags", Advanced = true)] public IEnumerable RequiredFlags { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs b/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs index 60099bccf..8f31e2e9c 100644 --- a/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs +++ b/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs @@ -62,7 +62,7 @@ namespace NzbDrone.Core.Indexers.Torznab public int MinimumSeeders { get; set; } [FieldDefinition(9)] - public SeedCriteriaSettings SeedCriteria { get; } = new SeedCriteriaSettings(); + public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings(); // [FieldDefinition(10, Type = FieldType.Tag, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://github.com/Radarr/Radarr/wiki/Indexer-Flags#1-required-flags", Advanced = true)] public IEnumerable RequiredFlags { get; set; }