From f43210d3d0c37e35705ea0d3337f6d263a61b1b2 Mon Sep 17 00:00:00 2001 From: Qstick Date: Thu, 17 Oct 2019 23:06:01 -0400 Subject: [PATCH] Fixed: Default RequireFlags Value (AKA Give torrent guys back their indexers) --- src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs | 3 ++- src/NzbDrone.Core/Indexers/HDBits/HDBitsSettings.cs | 3 ++- src/NzbDrone.Core/Indexers/IPTorrents/IPTorrentsSettings.cs | 3 ++- src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs | 3 ++- .../Indexers/PassThePopcorn/PassThePopcornSettings.cs | 3 ++- src/NzbDrone.Core/Indexers/Rarbg/RarbgSettings.cs | 4 +++- .../Indexers/TorrentPotato/TorrentPotatoSettings.cs | 3 ++- .../Indexers/TorrentRss/TorrentRssIndexerSettings.cs | 3 ++- src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs | 3 ++- 9 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs b/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs index efa8fb475..7c8b6d0c0 100644 --- a/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs +++ b/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs @@ -29,6 +29,7 @@ namespace NzbDrone.Core.Indexers.AwesomeHD BaseUrl = "https://awesome-hd.me"; MinimumSeeders = 0; MultiLanguages = new List(); + RequiredFlags = new List(); } [FieldDefinition(0, Label = "API URL", Advanced = true, HelpText = "Do not change this unless you know what you're doing. Since you Passkey will be sent to that host.")] @@ -43,7 +44,7 @@ namespace NzbDrone.Core.Indexers.AwesomeHD [FieldDefinition(3, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)] public int MinimumSeeders { get; set; } - [FieldDefinition(4, 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)] + // [FieldDefinition(4, 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; } [FieldDefinition(5)] diff --git a/src/NzbDrone.Core/Indexers/HDBits/HDBitsSettings.cs b/src/NzbDrone.Core/Indexers/HDBits/HDBitsSettings.cs index 492f7c162..18e46da56 100644 --- a/src/NzbDrone.Core/Indexers/HDBits/HDBitsSettings.cs +++ b/src/NzbDrone.Core/Indexers/HDBits/HDBitsSettings.cs @@ -35,6 +35,7 @@ namespace NzbDrone.Core.Indexers.HDBits Codecs = new int[0]; Mediums = new int[0]; MultiLanguages = new List(); + RequiredFlags = new List(); } [FieldDefinition(0, Label = "Username")] @@ -61,7 +62,7 @@ namespace NzbDrone.Core.Indexers.HDBits [FieldDefinition(7, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)] public int MinimumSeeders { get; set; } - [FieldDefinition(8, 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)] + // [FieldDefinition(8, 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; } [FieldDefinition(9)] diff --git a/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrentsSettings.cs b/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrentsSettings.cs index 7d8b2c72c..8ed3f8284 100644 --- a/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrentsSettings.cs +++ b/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrentsSettings.cs @@ -36,6 +36,7 @@ namespace NzbDrone.Core.Indexers.IPTorrents BaseUrl = string.Empty; MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS; MultiLanguages = new List(); + RequiredFlags = new List(); } [FieldDefinition(0, Label = "Feed URL", HelpText = "The full RSS feed url generated by IPTorrents, using only the categories you selected (HD, SD, x264, etc ...)")] @@ -47,7 +48,7 @@ namespace NzbDrone.Core.Indexers.IPTorrents [FieldDefinition(2, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)] public int MinimumSeeders { get; set; } - [FieldDefinition(3, 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)] + // [FieldDefinition(3, 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; } [FieldDefinition(4)] diff --git a/src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs b/src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs index 3e737eeed..6b1ccc0fb 100644 --- a/src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs +++ b/src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs @@ -30,6 +30,7 @@ namespace NzbDrone.Core.Indexers.Nyaa AdditionalParameters = "&cats=1_37&filter=1"; MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS; MultiLanguages = new List(); + RequiredFlags = new List(); } [FieldDefinition(0, Label = "Website URL")] @@ -44,7 +45,7 @@ namespace NzbDrone.Core.Indexers.Nyaa [FieldDefinition(3, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)] public int MinimumSeeders { get; set; } - [FieldDefinition(4, 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)] + // [FieldDefinition(4, 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; } [FieldDefinition(5)] diff --git a/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornSettings.cs b/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornSettings.cs index 5c1f63135..d03c7ea27 100644 --- a/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornSettings.cs +++ b/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornSettings.cs @@ -31,6 +31,7 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn BaseUrl = "https://passthepopcorn.me"; MinimumSeeders = 0; MultiLanguages = new List(); + RequiredFlags = new List(); } [FieldDefinition(0, Label = "URL", Advanced = true, HelpText = "Do not change this unless you know what you're doing. Since your cookie will be sent to that host.")] @@ -51,7 +52,7 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn [FieldDefinition(5)] public SeedCriteriaSettings SeedCriteria { get; } = 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)] + // [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; } public NzbDroneValidationResult Validate() diff --git a/src/NzbDrone.Core/Indexers/Rarbg/RarbgSettings.cs b/src/NzbDrone.Core/Indexers/Rarbg/RarbgSettings.cs index 4df1bb6f0..f434ee56c 100644 --- a/src/NzbDrone.Core/Indexers/Rarbg/RarbgSettings.cs +++ b/src/NzbDrone.Core/Indexers/Rarbg/RarbgSettings.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using FluentValidation; using NzbDrone.Core.Annotations; +using NzbDrone.Core.Languages; using NzbDrone.Core.Parser; using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Validation; @@ -31,6 +32,7 @@ namespace NzbDrone.Core.Indexers.Rarbg MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS; Categories = new[] { 14, 48, 17, 44, 45, 47, 50, 51, 52, 42, 46 }; MultiLanguages = new List(); + RequiredFlags = new List(); } [FieldDefinition(0, Label = "API URL", HelpText = "URL to Rarbg api, not the website.")] @@ -48,7 +50,7 @@ namespace NzbDrone.Core.Indexers.Rarbg [FieldDefinition(4, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)] public int MinimumSeeders { get; set; } - [FieldDefinition(5, 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)] + // [FieldDefinition(5, 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; } [FieldDefinition(6, Type = FieldType.Textbox, Label = "Categories", HelpText = "Comma Separated list, you can retrieve the ID by checking the URL behind the category on the website (i.e. Movie/x264/1080 = 44)", HelpLink = "https://rarbgmirror.org/torrents.php?category=movies", Advanced = true)] diff --git a/src/NzbDrone.Core/Indexers/TorrentPotato/TorrentPotatoSettings.cs b/src/NzbDrone.Core/Indexers/TorrentPotato/TorrentPotatoSettings.cs index 8069ba36c..9a7ce65ec 100644 --- a/src/NzbDrone.Core/Indexers/TorrentPotato/TorrentPotatoSettings.cs +++ b/src/NzbDrone.Core/Indexers/TorrentPotato/TorrentPotatoSettings.cs @@ -28,6 +28,7 @@ namespace NzbDrone.Core.Indexers.TorrentPotato BaseUrl = "http://127.0.0.1"; MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS; MultiLanguages = new List(); + RequiredFlags = new List(); } [FieldDefinition(0, Label = "API URL", HelpText = "URL to TorrentPotato api.")] @@ -48,7 +49,7 @@ namespace NzbDrone.Core.Indexers.TorrentPotato [FieldDefinition(5)] public SeedCriteriaSettings SeedCriteria { get; } = new SeedCriteriaSettings(); - [FieldDefinition(6, Type = FieldType.Tag, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", Advanced = true)] + // [FieldDefinition(6, Type = FieldType.Tag, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", Advanced = true)] public IEnumerable RequiredFlags { get; set; } public NzbDroneValidationResult Validate() diff --git a/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssIndexerSettings.cs b/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssIndexerSettings.cs index f9cd9b57a..c5f817b68 100644 --- a/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssIndexerSettings.cs +++ b/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssIndexerSettings.cs @@ -28,6 +28,7 @@ namespace NzbDrone.Core.Indexers.TorrentRss AllowZeroSize = false; MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS; MultiLanguages = new List(); + RequiredFlags = new List(); } [FieldDefinition(0, Label = "Full RSS Feed URL")] @@ -48,7 +49,7 @@ namespace NzbDrone.Core.Indexers.TorrentRss [FieldDefinition(5)] public SeedCriteriaSettings SeedCriteria { get; } = 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)] + // [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; } public NzbDroneValidationResult Validate() diff --git a/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs b/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs index 76dc4fff7..f29fad2a3 100644 --- a/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs +++ b/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs @@ -57,6 +57,7 @@ namespace NzbDrone.Core.Indexers.Torznab public TorznabSettings() { MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS; + RequiredFlags = new List(); } [FieldDefinition(8, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)] @@ -65,7 +66,7 @@ namespace NzbDrone.Core.Indexers.Torznab [FieldDefinition(9)] public SeedCriteriaSettings SeedCriteria { get; } = 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)] + // [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; } public override NzbDroneValidationResult Validate()