open-source-mirrors
/
Prowlarr
mirror of https://github.com/Prowlarr/Prowlarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove Multi-Lang from IndexerSettings

Browse Source
pull/6/head
Qstick 4 years ago
parent 66f726bf6f
commit 1c292ed190
12 changed files with 7 additions and 66 deletions
Show Stats Download Patch File Download Diff File

9
src/NzbDrone.Core/Indexers/Definitions/AwesomeHD/AwesomeHDSettings.cs
Unescape View File

@ -2,7 +2,6 @@ using System.Collections.Generic;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Languages;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Indexers.AwesomeHD
@ -22,17 +21,13 @@ namespace NzbDrone.Core.Indexers.AwesomeHD
public AwesomeHDSettings()
{
BaseUrl = "https://awesome-hd.me";
MultiLanguages = new List<int>();
BaseUrl = "https://awesome-hd.club";
}
[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.")]
public string BaseUrl { get; set; }
[FieldDefinition(1, Type = FieldType.Select, SelectOptions = typeof(LanguageFieldConverter), Label = "Multi Languages", HelpText = "What languages are normally in a multi release on this indexer?", Advanced = true)]
public IEnumerable<int> MultiLanguages { get; set; }
[FieldDefinition(2, Label = "Passkey", Privacy = PrivacyLevel.ApiKey)]
[FieldDefinition(1, Label = "Passkey", Privacy = PrivacyLevel.ApiKey)]
public string Passkey { get; set; }
public NzbDroneValidationResult Validate()

4
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannSettings.cs
Unescape View File

@ -20,7 +20,6 @@ namespace NzbDrone.Core.Indexers.Cardigann
public CardigannSettings()
{
MultiLanguages = new List<int>();
ExtraFieldData = new Dictionary<string, object>();
}
@ -31,9 +30,6 @@ namespace NzbDrone.Core.Indexers.Cardigann
public string BaseUrl { get; set; }
[FieldDefinition(1000, Type = FieldType.Select, SelectOptions = typeof(LanguageFieldConverter), Label = "Multi Languages", HelpText = "What languages are normally in a multi release on this indexer?", Advanced = true)]
public IEnumerable<int> MultiLanguages { get; set; }
// Field 8 is used by TorznabSettings MinimumSeeders
// If you need to add another field here, update TorznabSettings as well and this comment
public virtual NzbDroneValidationResult Validate()

10
src/NzbDrone.Core/Indexers/Definitions/FileList/FileListSettings.cs
Unescape View File

@ -24,22 +24,16 @@ namespace NzbDrone.Core.Indexers.FileList
public FileListSettings()
{
BaseUrl = "https://filelist.io";
MultiLanguages = new List<int>();
}
public string BaseUrl { get; set; }
[FieldDefinition(0, Label = "Username", Privacy = PrivacyLevel.UserName)]
public string Username { get; set; }
[FieldDefinition(1, Label = "Passkey", Privacy = PrivacyLevel.ApiKey)]
public string Passkey { get; set; }
[FieldDefinition(2, Type = FieldType.Select, SelectOptions = typeof(LanguageFieldConverter), Label = "Multi Languages", HelpText = "What languages are normally in a multi release on this indexer?", Advanced = true)]
public IEnumerable<int> MultiLanguages { get; set; }
[FieldDefinition(3, 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.")]
public string BaseUrl { get; set; }
public NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));

4
src/NzbDrone.Core/Indexers/Definitions/HDBits/HDBitsSettings.cs
Unescape View File

@ -25,15 +25,11 @@ namespace NzbDrone.Core.Indexers.HDBits
BaseUrl = "https://hdbits.org";
Codecs = System.Array.Empty<int>();
Mediums = System.Array.Empty<int>();
MultiLanguages = new List<int>();
}
[FieldDefinition(0, Label = "Username", Privacy = PrivacyLevel.UserName)]
public string Username { get; set; }
[FieldDefinition(1, Type = FieldType.Select, SelectOptions = typeof(LanguageFieldConverter), Label = "Multi Languages", HelpText = "What languages are normally in a multi release on this indexer?", Advanced = true)]
public IEnumerable<int> MultiLanguages { get; set; }
[FieldDefinition(2, Label = "API Key", Privacy = PrivacyLevel.ApiKey)]
public string ApiKey { get; set; }

4
src/NzbDrone.Core/Indexers/Definitions/IPTorrents/IPTorrentsSettings.cs
Unescape View File

@ -30,15 +30,11 @@ namespace NzbDrone.Core.Indexers.IPTorrents
public IPTorrentsSettings()
{
BaseUrl = string.Empty;
MultiLanguages = new List<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 ...)")]
public string BaseUrl { get; set; }
[FieldDefinition(1, Type = FieldType.Select, SelectOptions = typeof(LanguageFieldConverter), Label = "Multi Languages", HelpText = "What languages are normally in a multi release on this indexer?", Advanced = true)]
public IEnumerable<int> MultiLanguages { get; set; }
public NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));

11
src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabSettings.cs
Unescape View File

@ -51,7 +51,6 @@ namespace NzbDrone.Core.Indexers.Newznab
public NewznabSettings()
{
ApiPath = "/api";
MultiLanguages = new List<int>();
}
[FieldDefinition(0, Label = "URL")]
@ -60,22 +59,12 @@ namespace NzbDrone.Core.Indexers.Newznab
[FieldDefinition(1, Label = "API Path", HelpText = "Path to the api, usually /api", Advanced = true)]
public string ApiPath { get; set; }
[FieldDefinition(1, Type = FieldType.Select, SelectOptions = typeof(LanguageFieldConverter), Label = "Multi Languages", HelpText = "What languages are normally in a multi release on this indexer?", Advanced = true)]
public IEnumerable<int> MultiLanguages { get; set; }
[FieldDefinition(2, Label = "API Key", Privacy = PrivacyLevel.ApiKey)]
public string ApiKey { get; set; }
[FieldDefinition(5, Label = "Additional Parameters", HelpText = "Additional Newznab parameters", Advanced = true)]
public string AdditionalParameters { get; set; }
[FieldDefinition(6,
Label = "Remove year from search string",
HelpText = "Should Prowlarr remove the year after the title when searching this indexer?",
Advanced = true,
Type = FieldType.Checkbox)]
public bool RemoveYear { get; set; }
public List<IndexerCategory> Categories { get; set; }
// Field 8 is used by TorznabSettings MinimumSeeders

6
src/NzbDrone.Core/Indexers/Definitions/Nyaa/NyaaSettings.cs
Unescape View File

@ -25,16 +25,12 @@ namespace NzbDrone.Core.Indexers.Nyaa
{
BaseUrl = "";
AdditionalParameters = "";
MultiLanguages = new List<int>();
}
[FieldDefinition(0, Label = "Website URL")]
public string BaseUrl { get; set; }
[FieldDefinition(1, Type = FieldType.Select, SelectOptions = typeof(LanguageFieldConverter), Label = "Multi Languages", HelpText = "What languages are normally in a multi release on this indexer?", Advanced = true)]
public IEnumerable<int> MultiLanguages { get; set; }
[FieldDefinition(2, Label = "Additional Parameters", Advanced = true, HelpText = "Please note if you change the category you will have to add required/restricted rules about the subgroups to avoid foreign language releases.")]
[FieldDefinition(1, Label = "Additional Parameters", Advanced = true, HelpText = "Please note if you change the category you will have to add required/restricted rules about the subgroups to avoid foreign language releases.")]
public string AdditionalParameters { get; set; }
public NzbDroneValidationResult Validate()

9
src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornSettings.cs
Unescape View File

@ -24,21 +24,16 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
public PassThePopcornSettings()
{
BaseUrl = "https://passthepopcorn.me";
MultiLanguages = new List<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.")]
public string BaseUrl { get; set; }
[FieldDefinition(1, Label = "APIUser", HelpText = "These settings are found in your PassThePopcorn security settings (Edit Profile > Security).", Privacy = PrivacyLevel.UserName)]
[FieldDefinition(0, Label = "APIUser", HelpText = "These settings are found in your PassThePopcorn security settings (Edit Profile > Security).", Privacy = PrivacyLevel.UserName)]
public string APIUser { get; set; }
[FieldDefinition(2, Label = "APIKey", Type = FieldType.Password, Privacy = PrivacyLevel.Password)]
[FieldDefinition(1, Label = "APIKey", Type = FieldType.Password, Privacy = PrivacyLevel.Password)]
public string APIKey { get; set; }
[FieldDefinition(3, Type = FieldType.Select, SelectOptions = typeof(LanguageFieldConverter), Label = "Multi Languages", HelpText = "What languages are normally in a multi release on this indexer?", Advanced = true)]
public IEnumerable<int> MultiLanguages { get; set; }
public NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));

5
src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgSettings.cs
Unescape View File

@ -23,10 +23,8 @@ namespace NzbDrone.Core.Indexers.Rarbg
{
BaseUrl = "https://torrentapi.org";
RankedOnly = false;
MultiLanguages = new List<int>();
}
[FieldDefinition(0, Label = "API URL", HelpText = "URL to Rarbg api, not the website.")]
public string BaseUrl { get; set; }
[FieldDefinition(1, Type = FieldType.Checkbox, Label = "Ranked Only", HelpText = "Only include ranked results.")]
@ -35,9 +33,6 @@ namespace NzbDrone.Core.Indexers.Rarbg
[FieldDefinition(2, Type = FieldType.Captcha, Label = "CAPTCHA Token", HelpText = "CAPTCHA Clearance token used to handle CloudFlare Anti-DDOS measures on shared-ip VPNs.")]
public string CaptchaToken { get; set; }
[FieldDefinition(3, Type = FieldType.Select, SelectOptions = typeof(LanguageFieldConverter), Label = "Multi Languages", HelpText = "What languages are normally in a multi release on this indexer?", Advanced = true)]
public IEnumerable<int> MultiLanguages { get; set; }
public NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));

4
src/NzbDrone.Core/Indexers/Definitions/TorrentPotato/TorrentPotatoSettings.cs
Unescape View File

@ -22,7 +22,6 @@ namespace NzbDrone.Core.Indexers.TorrentPotato
public TorrentPotatoSettings()
{
BaseUrl = "http://127.0.0.1";
MultiLanguages = new List<int>();
}
[FieldDefinition(0, Label = "API URL", HelpText = "URL to TorrentPotato api.")]
@ -34,9 +33,6 @@ namespace NzbDrone.Core.Indexers.TorrentPotato
[FieldDefinition(2, Label = "Passkey", HelpText = "The password you use at your Indexer.", Privacy = PrivacyLevel.Password)]
public string Passkey { get; set; }
[FieldDefinition(3, Type = FieldType.Select, SelectOptions = typeof(LanguageFieldConverter), Label = "Multi Languages", HelpText = "What languages are normally in a multi release on this indexer?", Advanced = true)]
public IEnumerable<int> MultiLanguages { get; set; }
public NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));

4
src/NzbDrone.Core/Indexers/Definitions/TorrentRss/TorrentRssIndexerSettings.cs
Unescape View File

@ -23,7 +23,6 @@ namespace NzbDrone.Core.Indexers.TorrentRss
{
BaseUrl = string.Empty;
AllowZeroSize = false;
MultiLanguages = new List<int>();
}
[FieldDefinition(0, Label = "Full RSS Feed URL")]
@ -35,9 +34,6 @@ namespace NzbDrone.Core.Indexers.TorrentRss
[FieldDefinition(2, Type = FieldType.Checkbox, Label = "Allow Zero Size", HelpText = "Enabling this will allow you to use feeds that don't specify release size, but be careful, size related checks will not be performed.")]
public bool AllowZeroSize { get; set; }
[FieldDefinition(3, Type = FieldType.Select, SelectOptions = typeof(LanguageFieldConverter), Label = "Multi Languages", HelpText = "What languages are normally in a multi release on this indexer?", Advanced = true)]
public IEnumerable<int> MultiLanguages { get; set; }
public NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));

3
src/NzbDrone.Core/Indexers/IIndexerSettings.cs
Unescape View File

@ -6,8 +6,5 @@ namespace NzbDrone.Core.Indexers
public interface IIndexerSettings : IProviderConfig
{
string BaseUrl { get; set; }
// TODO: Need to Create UI field for this and turn functionality back on per indexer.
IEnumerable<int> MultiLanguages { get; set; }
}
}

Write Preview
Loading…
Cancel
Save