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

Fixed: Remove non-functional filters for Trakt Lists 

Co-authored-by: Qstick <qstick@gmail.com>
This commit is contained in:
Stevie Robinson 2022-09-22 18:48:03 +02:00 committed by GitHub
parent 3477dfacd0
commit 96345c0a0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,6 @@
using System.Text.RegularExpressions;
using FluentValidation; using FluentValidation;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations; using NzbDrone.Core.Annotations;
namespace NzbDrone.Core.ImportLists.Trakt.Popular namespace NzbDrone.Core.ImportLists.Trakt.Popular
@ -9,6 +11,18 @@ namespace NzbDrone.Core.ImportLists.Trakt.Popular
: base() : base()
{ {
RuleFor(c => c.TraktListType).NotNull(); RuleFor(c => c.TraktListType).NotNull();
// Loose validation @TODO
RuleFor(c => c.Rating)
.Matches(@"^\d+\-\d+$", RegexOptions.IgnoreCase)
.When(c => c.Rating.IsNotNullOrWhiteSpace())
.WithMessage("Not a valid rating");
// Loose validation @TODO
RuleFor(c => c.Years)
.Matches(@"^\d+(\-\d+)?$", RegexOptions.IgnoreCase)
.When(c => c.Years.IsNotNullOrWhiteSpace())
.WithMessage("Not a valid year or range of years");
} }
} }
@ -23,5 +37,14 @@ namespace NzbDrone.Core.ImportLists.Trakt.Popular
[FieldDefinition(1, Label = "List Type", Type = FieldType.Select, SelectOptions = typeof(TraktPopularListType), HelpText = "Type of list you're seeking to import from")] [FieldDefinition(1, Label = "List Type", Type = FieldType.Select, SelectOptions = typeof(TraktPopularListType), HelpText = "Type of list you're seeking to import from")]
public int TraktListType { get; set; } public int TraktListType { get; set; }
[FieldDefinition(2, Label = "Rating", HelpText = "Filter series by rating range (0-100)")]
public string Rating { get; set; }
[FieldDefinition(4, Label = "Genres", HelpText = "Filter series by Trakt Genre Slug (Comma Separated) Only for Popular Lists")]
public string Genres { get; set; }
[FieldDefinition(5, Label = "Years", HelpText = "Filter series by year or year range")]
public string Years { get; set; }
} }
} }

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

@ -1,5 +1,4 @@
using System; using System;
using System.Text.RegularExpressions;
using FluentValidation; using FluentValidation;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
using NzbDrone.Core.Annotations; using NzbDrone.Core.Annotations;
@ -28,18 +27,6 @@ namespace NzbDrone.Core.ImportLists.Trakt
.WithMessage("Must authenticate with Trakt") .WithMessage("Must authenticate with Trakt")
.When(c => c.AccessToken.IsNotNullOrWhiteSpace() && c.RefreshToken.IsNotNullOrWhiteSpace()); .When(c => c.AccessToken.IsNotNullOrWhiteSpace() && c.RefreshToken.IsNotNullOrWhiteSpace());
// Loose validation @TODO
RuleFor(c => c.Rating)
.Matches(@"^\d+\-\d+$", RegexOptions.IgnoreCase)
.When(c => c.Rating.IsNotNullOrWhiteSpace())
.WithMessage("Not a valid rating");
// Loose validation @TODO
RuleFor(c => c.Years)
.Matches(@"^\d+(\-\d+)?$", RegexOptions.IgnoreCase)
.When(c => c.Years.IsNotNullOrWhiteSpace())
.WithMessage("Not a valid year or range of years");
// Limit not smaller than 1 and not larger than 100 // Limit not smaller than 1 and not larger than 100
RuleFor(c => c.Limit) RuleFor(c => c.Limit)
.GreaterThan(0) .GreaterThan(0)
@ -56,9 +43,6 @@ namespace NzbDrone.Core.ImportLists.Trakt
{ {
BaseUrl = "https://api.trakt.tv"; BaseUrl = "https://api.trakt.tv";
SignIn = "startOAuth"; SignIn = "startOAuth";
Rating = "0-100";
Genres = "";
Years = "";
Limit = 100; Limit = 100;
} }
@ -76,15 +60,6 @@ namespace NzbDrone.Core.ImportLists.Trakt
[FieldDefinition(0, Label = "Auth User", Type = FieldType.Textbox, Hidden = HiddenType.Hidden)] [FieldDefinition(0, Label = "Auth User", Type = FieldType.Textbox, Hidden = HiddenType.Hidden)]
public string AuthUser { get; set; } public string AuthUser { get; set; }
[FieldDefinition(1, Label = "Rating", HelpText = "Filter series by rating range (0-100)")]
public string Rating { get; set; }
[FieldDefinition(3, Label = "Genres", HelpText = "Filter series by Trakt Genre Slug (Comma Separated)")]
public string Genres { get; set; }
[FieldDefinition(4, Label = "Years", HelpText = "Filter series by year or year range")]
public string Years { get; set; }
[FieldDefinition(5, Label = "Limit", HelpText = "Limit the number of series to get")] [FieldDefinition(5, Label = "Limit", HelpText = "Limit the number of series to get")]
public int Limit { get; set; } public int Limit { get; set; }