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

Merge pull request #1096 from geogolem/refactorFilteringExpression

Browse Source 
refactor so that filteringExpressions are constructed in one place
pull/2/head
geogolem 8 years ago committed by GitHub
parent 71eaa98518 866cec096d
commit 3d9fd3ff25
5 changed files with 59 additions and 83 deletions
Show Stats Download Patch File Download Diff File

51
src/NzbDrone.Api/Series/MovieModule.cs
Unescape View File

@ -116,56 +116,9 @@ namespace NzbDrone.Api.Movie
{ {
var pagingSpec = pagingResource.MapToPagingSpec<MovieResource, Core.Tv.Movie>(); var pagingSpec = pagingResource.MapToPagingSpec<MovieResource, Core.Tv.Movie>();
if (pagingResource.FilterKey == "monitored" && pagingResource.FilterValue == "false") pagingSpec.FilterExpression = _moviesService.ConstructFilterExpression(pagingResource.FilterKey, pagingResource.FilterValue, pagingResource.FilterType);
{
pagingSpec.FilterExpression = v => v.Monitored == false;
}
else if (pagingResource.FilterKey == "monitored")
{
pagingSpec.FilterExpression = v => v.Monitored == true;
}
if (pagingResource.FilterKey == "status")
{
switch (pagingResource.FilterValue)
{
case "released":
pagingSpec.FilterExpression = v => v.Status == MovieStatusType.Released;
break;
case "inCinemas":
pagingSpec.FilterExpression = v => v.Status == MovieStatusType.InCinemas;
break;
case "announced":
pagingSpec.FilterExpression = v => v.Status == MovieStatusType.Announced;
break;
}
}
if (pagingResource.FilterKey == "downloaded")
{
pagingSpec.FilterExpression = v => v.MovieFileId == 0;
}
if (pagingResource.FilterKey == "title")
{
if (pagingResource.FilterValue == string.Empty || pagingResource.FilterValue == null)
{
pagingSpec.FilterExpression = v => true;
}
else
{
if (pagingResource.FilterType == "contains")
{
pagingSpec.FilterExpression = v => v.CleanTitle.Contains(pagingResource.FilterValue);
}
else
{
pagingSpec.FilterExpression = v => v.CleanTitle == pagingResource.FilterValue;
}
}
}
return ApplyToPage(_moviesService.Paged, pagingSpec, MovieResourceMapper.ToResource); return ApplyToPage(_moviesService.Paged, pagingSpec, MovieResourceMapper.ToResource);
} }
protected MovieResource MapToResource(Core.Tv.Movie movies) protected MovieResource MapToResource(Core.Tv.Movie movies)

63
src/NzbDrone.Core/Tv/MovieService.cs
Unescape View File

@ -41,7 +41,7 @@ namespace NzbDrone.Core.Tv
bool MoviePathExists(string folder); bool MoviePathExists(string folder);
void RemoveAddOptions(Movie movie); void RemoveAddOptions(Movie movie);
List<Movie> MoviesWithFiles(int movieId); List<Movie> MoviesWithFiles(int movieId);
System.Linq.Expressions.Expression<Func<Core.Tv.Movie, bool>> ConstructFilterExpression(string FilterKey, string FilterValue); System.Linq.Expressions.Expression<Func<Core.Tv.Movie, bool>> ConstructFilterExpression(string FilterKey, string FilterValue, string filterType = null);
} }
public class MovieService : IMovieService, IHandle<MovieFileAddedEvent>, public class MovieService : IMovieService, IHandle<MovieFileAddedEvent>,
@ -69,42 +69,65 @@ namespace NzbDrone.Core.Tv
} }
public System.Linq.Expressions.Expression<Func<Core.Tv.Movie, bool>> ConstructFilterExpression(string FilterKey, string FilterValue) public System.Linq.Expressions.Expression<Func<Core.Tv.Movie, bool>> ConstructFilterExpression(string FilterKey, string FilterValue, string FilterType = null)
{ {
if (FilterKey == "all" && FilterValue == "all") //if (FilterKey == "all" && FilterValue == "all")
{ //{
return v => v.Monitored == true || v.Monitored == false; // return v => v.Monitored == true || v.Monitored == false;
} //}
else if (FilterKey == "monitored" && FilterValue == "false") if (FilterKey == "moviemonitored" && FilterValue == "false")
{ {
return v => v.Monitored == false; return v => v.Monitored == false;
} }
else if (FilterKey == "monitored" && FilterValue == "true") else if (FilterKey == "moviemonitored" && FilterValue == "true")
{ {
return v => v.Monitored == true; return v => v.Monitored == true;
} }
else if (FilterKey == "moviestatus" && FilterValue == "available") else if (FilterKey == "moviestatus")
{ {
//TODO: might need to handle PreDB here switch (FilterValue)
return v => v.Monitored == true && {
case "released":
return v => v.Status == MovieStatusType.Released;
break;
case "inCinemas":
return v => v.Status == MovieStatusType.InCinemas;
break;
case "announced":
return v => v.Status == MovieStatusType.Announced;
break;
case "available":
return v => v.Monitored == true &&
((v.MinimumAvailability == MovieStatusType.Released && v.Status >= MovieStatusType.Released) || ((v.MinimumAvailability == MovieStatusType.Released && v.Status >= MovieStatusType.Released) ||
(v.MinimumAvailability == MovieStatusType.InCinemas && v.Status >= MovieStatusType.InCinemas) || (v.MinimumAvailability == MovieStatusType.InCinemas && v.Status >= MovieStatusType.InCinemas) ||
(v.MinimumAvailability == MovieStatusType.Announced && v.Status >= MovieStatusType.Announced) || (v.MinimumAvailability == MovieStatusType.Announced && v.Status >= MovieStatusType.Announced) ||
(v.MinimumAvailability == MovieStatusType.PreDB && v.Status >= MovieStatusType.Released)); (v.MinimumAvailability == MovieStatusType.PreDB && v.Status >= MovieStatusType.Released));
break;
}
} }
else if (FilterKey == "moviestatus" && FilterValue == "announced") else if (FilterKey == "moviedownloaded")
{
return v => v.Status == MovieStatusType.Announced;
}
else if (FilterKey == "moviestatus" && FilterValue == "incinemas")
{ {
return v => v.Status == MovieStatusType.InCinemas; return v => v.MovieFileId == 0;
} }
else if (FilterKey == "moviestatus" && FilterValue == "released") else if (FilterKey == "title")
{ {
return v => v.Status == MovieStatusType.Released; if (FilterValue == string.Empty || FilterValue == null)
{
return v => true;
}
else
{
if (FilterType == "contains")
{
return v => v.CleanTitle.Contains(FilterValue);
}
else
{
return v => v.CleanTitle == FilterValue;
}
}
} }
return v => v.Monitored == true; return v => true;
} }
public Movie GetMovie(int movieId) public Movie GetMovie(int movieId)

14
src/UI/Movies/MoviesCollection.js
Unescape View File

@ -19,33 +19,33 @@ var filterModes = {
null null
], ],
'continuing' : [ 'continuing' : [
'status', 'moviestatus',
'continuing' 'continuing'
], ],
'ended' : [ 'ended' : [
'status', 'moviestatus',
'ended' 'ended'
], ],
'monitored' : [ 'monitored' : [
'monitored', 'moviemonitored',
true true
], ],
'missing' : [ 'missing' : [
'downloaded', 'moviedownloaded',
false false
], ],
'released' : [ 'released' : [
"status", "moviestatus",
"released", "released",
//function(model) { return model.getStatus() == "released"; } //function(model) { return model.getStatus() == "released"; }
], ],
'announced' : [ 'announced' : [
"status", "moviestatus",
"announced", "announced",
//function(model) { return model.getStatus() == "announced"; } //function(model) { return model.getStatus() == "announced"; }
], ],
'cinemas' : [ 'cinemas' : [
"status", "moviestatus",
"inCinemas", "inCinemas",
//function(model) { return model.getStatus() == "inCinemas"; } //function(model) { return model.getStatus() == "inCinemas"; }
] ]

8
src/UI/Wanted/Cutoff/CutoffUnmetCollection.js
Unescape View File

@ -31,11 +31,11 @@ var Collection = PagableCollection.extend({
filterModes : { filterModes : {
'monitored' : [ 'monitored' : [
'monitored', 'moviemonitored',
'true' 'true'
], ],
'unmonitored' : [ 'unmonitored' : [
'monitored', 'moviemonitored',
'false' 'false'
], ],
'announced' : [ 'announced' : [
@ -44,7 +44,7 @@ var Collection = PagableCollection.extend({
], ],
'incinemas' : [ 'incinemas' : [
'moviestatus', 'moviestatus',
'incinemas' 'inCinemas'
], ],
'released' : [ 'released' : [
'moviestatus', 'moviestatus',
@ -77,4 +77,4 @@ var Collection = PagableCollection.extend({
Collection = AsFilteredCollection.call(Collection); Collection = AsFilteredCollection.call(Collection);
Collection = AsSortedCollection.call(Collection); Collection = AsSortedCollection.call(Collection);
module.exports = AsPersistedStateCollection.call(Collection); module.exports = AsPersistedStateCollection.call(Collection);

6
src/UI/Wanted/Missing/MissingCollection.js
Unescape View File

@ -30,11 +30,11 @@ var Collection = PagableCollection.extend({
filterModes : { filterModes : {
'monitored' : [ 'monitored' : [
'monitored', 'moviemonitored',
'true' 'true'
], ],
'unmonitored' : [ 'unmonitored' : [
'monitored', 'moviemonitored',
'false' 'false'
], ],
'announced' : [ 'announced' : [
@ -43,7 +43,7 @@ var Collection = PagableCollection.extend({
], ],
'incinemas' : [ 'incinemas' : [
'moviestatus', 'moviestatus',
'incinemas' 'inCinemas'
], ],
'released' : [ 'released' : [
'moviestatus', 'moviestatus',

Write Preview
Loading…
Cancel
Save