mirror of https://github.com/Radarr/Radarr
New: Company filters for TMDb Popular List
This commit is contained in:
parent
584910514a
commit
d303eae7c6
|
@ -36,6 +36,8 @@ namespace NzbDrone.Core.ImportLists.TMDb.Popular
|
||||||
var certification = Settings.FilterCriteria.Certification;
|
var certification = Settings.FilterCriteria.Certification;
|
||||||
var includeGenreIds = Settings.FilterCriteria.IncludeGenreIds;
|
var includeGenreIds = Settings.FilterCriteria.IncludeGenreIds;
|
||||||
var excludeGenreIds = Settings.FilterCriteria.ExcludeGenreIds;
|
var excludeGenreIds = Settings.FilterCriteria.ExcludeGenreIds;
|
||||||
|
var includeCompanyIds = Settings.FilterCriteria.IncludeCompanyIds;
|
||||||
|
var excludeCompanyIds = Settings.FilterCriteria.ExcludeCompanyIds;
|
||||||
var languageCode = (TMDbLanguageCodes)Settings.FilterCriteria.LanguageCode;
|
var languageCode = (TMDbLanguageCodes)Settings.FilterCriteria.LanguageCode;
|
||||||
|
|
||||||
var todaysDate = DateTime.Now.ToString("yyyy-MM-dd");
|
var todaysDate = DateTime.Now.ToString("yyyy-MM-dd");
|
||||||
|
@ -92,6 +94,16 @@ namespace NzbDrone.Core.ImportLists.TMDb.Popular
|
||||||
requestBuilder.AddQueryParam("without_genres", excludeGenreIds);
|
requestBuilder.AddQueryParam("without_genres", excludeGenreIds);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (includeCompanyIds.IsNotNullOrWhiteSpace())
|
||||||
|
{
|
||||||
|
requestBuilder.AddQueryParam("with_companies", includeCompanyIds);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (excludeCompanyIds.IsNotNullOrWhiteSpace())
|
||||||
|
{
|
||||||
|
requestBuilder.AddQueryParam("without_companies", excludeCompanyIds);
|
||||||
|
}
|
||||||
|
|
||||||
requestBuilder
|
requestBuilder
|
||||||
.AddQueryParam("with_original_language", languageCode)
|
.AddQueryParam("with_original_language", languageCode)
|
||||||
.Accept(HttpAccept.Json);
|
.Accept(HttpAccept.Json);
|
||||||
|
|
|
@ -38,6 +38,18 @@ namespace NzbDrone.Core.ImportLists.TMDb
|
||||||
.Matches(@"^\d+([,|]\d+)*$", RegexOptions.IgnoreCase)
|
.Matches(@"^\d+([,|]\d+)*$", RegexOptions.IgnoreCase)
|
||||||
.When(c => c.ExcludeGenreIds.IsNotNullOrWhiteSpace())
|
.When(c => c.ExcludeGenreIds.IsNotNullOrWhiteSpace())
|
||||||
.WithMessage("Genre Ids must be comma (,) or pipe (|) separated number ids");
|
.WithMessage("Genre Ids must be comma (,) or pipe (|) separated number ids");
|
||||||
|
|
||||||
|
// CSV of numbers
|
||||||
|
RuleFor(c => c.IncludeCompanyIds)
|
||||||
|
.Matches(@"^\d+([,|]\d+)*$", RegexOptions.IgnoreCase)
|
||||||
|
.When(c => c.IncludeCompanyIds.IsNotNullOrWhiteSpace())
|
||||||
|
.WithMessage("Company Ids must be comma (,) or pipe (|) separated number ids");
|
||||||
|
|
||||||
|
// CSV of numbers
|
||||||
|
RuleFor(c => c.ExcludeCompanyIds)
|
||||||
|
.Matches(@"^\d+([,|]\d+)*$", RegexOptions.IgnoreCase)
|
||||||
|
.When(c => c.ExcludeCompanyIds.IsNotNullOrWhiteSpace())
|
||||||
|
.WithMessage("Company Ids must be comma (,) or pipe (|) separated number ids");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,8 +60,10 @@ namespace NzbDrone.Core.ImportLists.TMDb
|
||||||
MinVoteAverage = "5";
|
MinVoteAverage = "5";
|
||||||
MinVotes = "1";
|
MinVotes = "1";
|
||||||
LanguageCode = (int)TMDbLanguageCodes.en;
|
LanguageCode = (int)TMDbLanguageCodes.en;
|
||||||
ExcludeGenreIds = "";
|
|
||||||
IncludeGenreIds = "";
|
IncludeGenreIds = "";
|
||||||
|
ExcludeGenreIds = "";
|
||||||
|
IncludeCompanyIds = "";
|
||||||
|
ExcludeCompanyIds = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
[FieldDefinition(1, Label = "Minimum Vote Average", HelpText = "Filter movies by votes (0.0-10.0)")]
|
[FieldDefinition(1, Label = "Minimum Vote Average", HelpText = "Filter movies by votes (0.0-10.0)")]
|
||||||
|
@ -67,7 +81,13 @@ namespace NzbDrone.Core.ImportLists.TMDb
|
||||||
[FieldDefinition(5, Label = "Exclude Genre Ids", HelpText = "Filter movies by TMDb Genre Ids (Comma Separated)")]
|
[FieldDefinition(5, Label = "Exclude Genre Ids", HelpText = "Filter movies by TMDb Genre Ids (Comma Separated)")]
|
||||||
public string ExcludeGenreIds { get; set; }
|
public string ExcludeGenreIds { get; set; }
|
||||||
|
|
||||||
[FieldDefinition(6, Label = "Original Language", Type = FieldType.Select, SelectOptions = typeof(TMDbLanguageCodes), HelpText = "Filter by Language")]
|
[FieldDefinition(6, Label = "Include Company Ids", HelpText = "Filter movies by TMDb Company Ids (Comma Separated)")]
|
||||||
|
public string IncludeCompanyIds { get; set; }
|
||||||
|
|
||||||
|
[FieldDefinition(7, Label = "Exclude Company Ids", HelpText = "Filter movies by TMDb Company Ids (Comma Separated)")]
|
||||||
|
public string ExcludeCompanyIds { get; set; }
|
||||||
|
|
||||||
|
[FieldDefinition(8, Label = "Original Language", Type = FieldType.Select, SelectOptions = typeof(TMDbLanguageCodes), HelpText = "Filter by Language")]
|
||||||
public int LanguageCode { get; set; }
|
public int LanguageCode { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue