mirror of
https://github.com/Radarr/Radarr.git
synced 2024-10-05 15:47:20 +02:00
Fixed: Improve Required Flags selection for indexers
This commit is contained in:
parent
3f444406da
commit
238ddbbe1f
@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using FluentValidation;
|
using FluentValidation;
|
||||||
using NzbDrone.Core.Annotations;
|
using NzbDrone.Core.Annotations;
|
||||||
@ -28,15 +29,15 @@ public FileListSettings()
|
|||||||
BaseUrl = "https://filelist.io";
|
BaseUrl = "https://filelist.io";
|
||||||
MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS;
|
MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS;
|
||||||
|
|
||||||
Categories = new int[]
|
Categories = new[]
|
||||||
{
|
{
|
||||||
(int)FileListCategories.Movie_HD,
|
(int)FileListCategories.Movie_HD,
|
||||||
(int)FileListCategories.Movie_SD,
|
(int)FileListCategories.Movie_SD,
|
||||||
(int)FileListCategories.Movie_4K
|
(int)FileListCategories.Movie_4K
|
||||||
};
|
};
|
||||||
|
|
||||||
MultiLanguages = new List<int>();
|
MultiLanguages = Array.Empty<int>();
|
||||||
RequiredFlags = new List<int>();
|
RequiredFlags = Array.Empty<int>();
|
||||||
}
|
}
|
||||||
|
|
||||||
[FieldDefinition(0, Label = "Username", Privacy = PrivacyLevel.UserName)]
|
[FieldDefinition(0, Label = "Username", Privacy = PrivacyLevel.UserName)]
|
||||||
@ -57,7 +58,7 @@ public FileListSettings()
|
|||||||
[FieldDefinition(5, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)]
|
[FieldDefinition(5, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)]
|
||||||
public int MinimumSeeders { get; set; }
|
public int MinimumSeeders { get; set; }
|
||||||
|
|
||||||
[FieldDefinition(6, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/radarr/settings#indexer-flags", Advanced = true)]
|
[FieldDefinition(6, Type = FieldType.Select, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/radarr/settings#indexer-flags", Advanced = true)]
|
||||||
public IEnumerable<int> RequiredFlags { get; set; }
|
public IEnumerable<int> RequiredFlags { get; set; }
|
||||||
|
|
||||||
[FieldDefinition(7)]
|
[FieldDefinition(7)]
|
||||||
|
@ -31,8 +31,8 @@ public HDBitsSettings()
|
|||||||
Categories = new[] { (int)HdBitsCategory.Movie };
|
Categories = new[] { (int)HdBitsCategory.Movie };
|
||||||
Codecs = Array.Empty<int>();
|
Codecs = Array.Empty<int>();
|
||||||
Mediums = Array.Empty<int>();
|
Mediums = Array.Empty<int>();
|
||||||
MultiLanguages = new List<int>();
|
MultiLanguages = Array.Empty<int>();
|
||||||
RequiredFlags = new List<int>();
|
RequiredFlags = Array.Empty<int>();
|
||||||
}
|
}
|
||||||
|
|
||||||
[FieldDefinition(0, Label = "API URL", Advanced = true, HelpText = "Do not change this unless you know what you're doing. Since your API key will be sent to that host.")]
|
[FieldDefinition(0, Label = "API URL", Advanced = true, HelpText = "Do not change this unless you know what you're doing. Since your API key will be sent to that host.")]
|
||||||
@ -59,7 +59,7 @@ public HDBitsSettings()
|
|||||||
[FieldDefinition(7, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)]
|
[FieldDefinition(7, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)]
|
||||||
public int MinimumSeeders { get; set; }
|
public int MinimumSeeders { get; set; }
|
||||||
|
|
||||||
[FieldDefinition(8, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/radarr/settings#indexer-flags", Advanced = true)]
|
[FieldDefinition(8, Type = FieldType.Select, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/radarr/settings#indexer-flags", Advanced = true)]
|
||||||
public IEnumerable<int> RequiredFlags { get; set; }
|
public IEnumerable<int> RequiredFlags { get; set; }
|
||||||
|
|
||||||
[FieldDefinition(9)]
|
[FieldDefinition(9)]
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using FluentValidation;
|
using FluentValidation;
|
||||||
@ -33,8 +34,8 @@ public IPTorrentsSettings()
|
|||||||
{
|
{
|
||||||
BaseUrl = string.Empty;
|
BaseUrl = string.Empty;
|
||||||
MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS;
|
MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS;
|
||||||
MultiLanguages = new List<int>();
|
MultiLanguages = Array.Empty<int>();
|
||||||
RequiredFlags = new List<int>();
|
RequiredFlags = Array.Empty<int>();
|
||||||
}
|
}
|
||||||
|
|
||||||
[FieldDefinition(0, Label = "Feed URL", HelpText = "The full RSS feed url generated by IPTorrents, using only the categories you selected (HD, SD, x264, etc ...)")]
|
[FieldDefinition(0, Label = "Feed URL", HelpText = "The full RSS feed url generated by IPTorrents, using only the categories you selected (HD, SD, x264, etc ...)")]
|
||||||
@ -46,7 +47,7 @@ public IPTorrentsSettings()
|
|||||||
[FieldDefinition(2, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)]
|
[FieldDefinition(2, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)]
|
||||||
public int MinimumSeeders { get; set; }
|
public int MinimumSeeders { get; set; }
|
||||||
|
|
||||||
[FieldDefinition(3, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/radarr/settings#indexer-flags", Advanced = true)]
|
[FieldDefinition(3, Type = FieldType.Select, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/radarr/settings#indexer-flags", Advanced = true)]
|
||||||
public IEnumerable<int> RequiredFlags { get; set; }
|
public IEnumerable<int> RequiredFlags { get; set; }
|
||||||
|
|
||||||
[FieldDefinition(4)]
|
[FieldDefinition(4)]
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
@ -55,7 +56,7 @@ public NewznabSettings()
|
|||||||
{
|
{
|
||||||
ApiPath = "/api";
|
ApiPath = "/api";
|
||||||
Categories = new[] { 2000, 2010, 2020, 2030, 2040, 2045, 2050, 2060 };
|
Categories = new[] { 2000, 2010, 2020, 2030, 2040, 2045, 2050, 2060 };
|
||||||
MultiLanguages = new List<int>();
|
MultiLanguages = Array.Empty<int>();
|
||||||
}
|
}
|
||||||
|
|
||||||
[FieldDefinition(0, Label = "URL")]
|
[FieldDefinition(0, Label = "URL")]
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using FluentValidation;
|
using FluentValidation;
|
||||||
@ -28,8 +29,8 @@ public NyaaSettings()
|
|||||||
BaseUrl = "";
|
BaseUrl = "";
|
||||||
AdditionalParameters = "&cats=1_0&filter=1";
|
AdditionalParameters = "&cats=1_0&filter=1";
|
||||||
MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS;
|
MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS;
|
||||||
MultiLanguages = new List<int>();
|
MultiLanguages = Array.Empty<int>();
|
||||||
RequiredFlags = new List<int>();
|
RequiredFlags = Array.Empty<int>();
|
||||||
}
|
}
|
||||||
|
|
||||||
[FieldDefinition(0, Label = "Website URL")]
|
[FieldDefinition(0, Label = "Website URL")]
|
||||||
@ -44,7 +45,7 @@ public NyaaSettings()
|
|||||||
[FieldDefinition(3, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)]
|
[FieldDefinition(3, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)]
|
||||||
public int MinimumSeeders { get; set; }
|
public int MinimumSeeders { get; set; }
|
||||||
|
|
||||||
[FieldDefinition(4, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/radarr/settings#indexer-flags", Advanced = true)]
|
[FieldDefinition(4, Type = FieldType.Select, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/radarr/settings#indexer-flags", Advanced = true)]
|
||||||
public IEnumerable<int> RequiredFlags { get; set; }
|
public IEnumerable<int> RequiredFlags { get; set; }
|
||||||
|
|
||||||
[FieldDefinition(5)]
|
[FieldDefinition(5)]
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using FluentValidation;
|
using FluentValidation;
|
||||||
using NzbDrone.Core.Annotations;
|
using NzbDrone.Core.Annotations;
|
||||||
@ -26,9 +27,9 @@ public class PassThePopcornSettings : ITorrentIndexerSettings
|
|||||||
public PassThePopcornSettings()
|
public PassThePopcornSettings()
|
||||||
{
|
{
|
||||||
BaseUrl = "https://passthepopcorn.me";
|
BaseUrl = "https://passthepopcorn.me";
|
||||||
MinimumSeeders = 0;
|
MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS;
|
||||||
MultiLanguages = new List<int>();
|
MultiLanguages = Array.Empty<int>();
|
||||||
RequiredFlags = new List<int>();
|
RequiredFlags = Array.Empty<int>();
|
||||||
}
|
}
|
||||||
|
|
||||||
[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.")]
|
[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.")]
|
||||||
@ -49,7 +50,7 @@ public PassThePopcornSettings()
|
|||||||
[FieldDefinition(5)]
|
[FieldDefinition(5)]
|
||||||
public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings();
|
public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings();
|
||||||
|
|
||||||
[FieldDefinition(6, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/radarr/settings#indexer-flags", Advanced = true)]
|
[FieldDefinition(6, Type = FieldType.Select, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/radarr/settings#indexer-flags", Advanced = true)]
|
||||||
public IEnumerable<int> RequiredFlags { get; set; }
|
public IEnumerable<int> RequiredFlags { get; set; }
|
||||||
|
|
||||||
public NzbDroneValidationResult Validate()
|
public NzbDroneValidationResult Validate()
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using FluentValidation;
|
using FluentValidation;
|
||||||
using NzbDrone.Core.Annotations;
|
using NzbDrone.Core.Annotations;
|
||||||
@ -25,8 +26,8 @@ public TorrentPotatoSettings()
|
|||||||
{
|
{
|
||||||
BaseUrl = "http://127.0.0.1";
|
BaseUrl = "http://127.0.0.1";
|
||||||
MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS;
|
MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS;
|
||||||
MultiLanguages = new List<int>();
|
MultiLanguages = Array.Empty<int>();
|
||||||
RequiredFlags = new List<int>();
|
RequiredFlags = Array.Empty<int>();
|
||||||
}
|
}
|
||||||
|
|
||||||
[FieldDefinition(0, Label = "API URL", HelpText = "URL to TorrentPotato api.")]
|
[FieldDefinition(0, Label = "API URL", HelpText = "URL to TorrentPotato api.")]
|
||||||
@ -47,7 +48,7 @@ public TorrentPotatoSettings()
|
|||||||
[FieldDefinition(5)]
|
[FieldDefinition(5)]
|
||||||
public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings();
|
public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings();
|
||||||
|
|
||||||
[FieldDefinition(6, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", Advanced = true)]
|
[FieldDefinition(6, Type = FieldType.Select, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", Advanced = true)]
|
||||||
public IEnumerable<int> RequiredFlags { get; set; }
|
public IEnumerable<int> RequiredFlags { get; set; }
|
||||||
|
|
||||||
public NzbDroneValidationResult Validate()
|
public NzbDroneValidationResult Validate()
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using FluentValidation;
|
using FluentValidation;
|
||||||
using NzbDrone.Core.Annotations;
|
using NzbDrone.Core.Annotations;
|
||||||
@ -26,8 +27,8 @@ public TorrentRssIndexerSettings()
|
|||||||
BaseUrl = string.Empty;
|
BaseUrl = string.Empty;
|
||||||
AllowZeroSize = false;
|
AllowZeroSize = false;
|
||||||
MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS;
|
MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS;
|
||||||
MultiLanguages = new List<int>();
|
MultiLanguages = Array.Empty<int>();
|
||||||
RequiredFlags = new List<int>();
|
RequiredFlags = Array.Empty<int>();
|
||||||
}
|
}
|
||||||
|
|
||||||
[FieldDefinition(0, Label = "Full RSS Feed URL")]
|
[FieldDefinition(0, Label = "Full RSS Feed URL")]
|
||||||
@ -48,7 +49,7 @@ public TorrentRssIndexerSettings()
|
|||||||
[FieldDefinition(5)]
|
[FieldDefinition(5)]
|
||||||
public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings();
|
public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings();
|
||||||
|
|
||||||
[FieldDefinition(6, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/radarr/settings#indexer-flags", Advanced = true)]
|
[FieldDefinition(6, Type = FieldType.Select, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/radarr/settings#indexer-flags", Advanced = true)]
|
||||||
public IEnumerable<int> RequiredFlags { get; set; }
|
public IEnumerable<int> RequiredFlags { get; set; }
|
||||||
|
|
||||||
public NzbDroneValidationResult Validate()
|
public NzbDroneValidationResult Validate()
|
||||||
|
@ -58,7 +58,7 @@ public TorznabSettings()
|
|||||||
[FieldDefinition(9)]
|
[FieldDefinition(9)]
|
||||||
public SeedCriteriaSettings SeedCriteria { get; set; } = new ();
|
public SeedCriteriaSettings SeedCriteria { get; set; } = new ();
|
||||||
|
|
||||||
[FieldDefinition(10, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/radarr/settings#indexer-flags", Advanced = true)]
|
[FieldDefinition(10, Type = FieldType.Select, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/radarr/settings#indexer-flags", Advanced = true)]
|
||||||
public IEnumerable<int> RequiredFlags { get; set; }
|
public IEnumerable<int> RequiredFlags { get; set; }
|
||||||
|
|
||||||
public override NzbDroneValidationResult Validate()
|
public override NzbDroneValidationResult Validate()
|
||||||
|
Loading…
Reference in New Issue
Block a user