Fixed: List UI Revamp

This commit is contained in:
Qstick
2020-06-09 01:51:23 -04:00
parent 2d59192a9e
commit 6802bfc736
75 changed files with 2095 additions and 738 deletions

View File

@@ -11,6 +11,7 @@ namespace NzbDrone.Core.NetImport.ImportExclusions
List<ImportExclusion> GetAllExclusions();
bool IsMovieExcluded(int tmdbId);
ImportExclusion AddExclusion(ImportExclusion exclusion);
List<ImportExclusion> AddExclusions(List<ImportExclusion> exclusions);
void RemoveExclusion(ImportExclusion exclusion);
ImportExclusion GetById(int id);
}
@@ -37,6 +38,13 @@ namespace NzbDrone.Core.NetImport.ImportExclusions
return _exclusionRepository.Insert(exclusion);
}
public List<ImportExclusion> AddExclusions(List<ImportExclusion> exclusions)
{
_exclusionRepository.InsertMany(exclusions);
return exclusions;
}
public List<ImportExclusion> GetAllExclusions()
{
return _exclusionRepository.All().ToList();

View File

@@ -3,6 +3,7 @@ using FluentValidation;
using NzbDrone.Core.NetImport;
using NzbDrone.Core.NetImport.ImportExclusions;
using Radarr.Http;
using Radarr.Http.Extensions;
namespace Radarr.Api.V3.NetImport
{
@@ -15,9 +16,9 @@ namespace Radarr.Api.V3.NetImport
{
_exclusionService = exclusionService;
GetResourceAll = GetAll;
CreateResource = AddExclusion;
DeleteResource = RemoveExclusion;
GetResourceById = GetById;
Post("/", x => AddExclusions());
SharedValidator.RuleFor(c => c.TmdbId).GreaterThan(0);
SharedValidator.RuleFor(c => c.MovieTitle).NotEmpty();
@@ -34,12 +35,13 @@ namespace Radarr.Api.V3.NetImport
return _exclusionService.GetById(id).ToResource();
}
public int AddExclusion(ImportExclusionsResource exclusionResource)
public object AddExclusions()
{
var model = exclusionResource.ToModel();
var resource = Request.Body.FromJson<List<ImportExclusionsResource>>();
var newMovies = resource.ToModel();
// TODO: Add some more validation here and auto pull the title if not provided
return _exclusionService.AddExclusion(model).Id;
return _exclusionService.AddExclusions(newMovies).ToResource();
}
public void RemoveExclusion(int id)

View File

@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using NzbDrone.Core.NetImport.ImportExclusions;
namespace Radarr.Api.V3.NetImport
{
@@ -13,7 +14,7 @@ namespace Radarr.Api.V3.NetImport
public static class ImportExclusionsResourceMapper
{
public static ImportExclusionsResource ToResource(this NzbDrone.Core.NetImport.ImportExclusions.ImportExclusion model)
public static ImportExclusionsResource ToResource(this ImportExclusion model)
{
if (model == null)
{
@@ -29,19 +30,24 @@ namespace Radarr.Api.V3.NetImport
};
}
public static List<ImportExclusionsResource> ToResource(this IEnumerable<NzbDrone.Core.NetImport.ImportExclusions.ImportExclusion> exclusions)
public static List<ImportExclusionsResource> ToResource(this IEnumerable<ImportExclusion> exclusions)
{
return exclusions.Select(ToResource).ToList();
}
public static NzbDrone.Core.NetImport.ImportExclusions.ImportExclusion ToModel(this ImportExclusionsResource resource)
public static ImportExclusion ToModel(this ImportExclusionsResource resource)
{
return new NzbDrone.Core.NetImport.ImportExclusions.ImportExclusion
return new ImportExclusion
{
TmdbId = resource.TmdbId,
MovieTitle = resource.MovieTitle,
MovieYear = resource.MovieYear
};
}
public static List<ImportExclusion> ToModel(this IEnumerable<ImportExclusionsResource> resources)
{
return resources.Select(ToModel).ToList();
}
}
}