tedkulp/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-04-21 22:04:31 -04:00
Code Issues Projects Releases Wiki Activity

Fixed: ReleasePush Validation and Error on Parse (#711)

Browse Source 
* Fixed: ReleasePush Validation and Error on Parse

* Fixed: Validation on Release module, Catch Errors in format
This commit is contained in:
Qstick
2019-04-04 20:08:47 -04:00
committed by GitHub
parent d8a361dd91
commit 57df287547
3 changed files with 56 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Lidarr.Api.V1/Indexers/ReleasePushModule.cs
+42 -9
View File
@@ -1,6 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using FluentValidation;
using FluentValidation.Results;
using Nancy;
using Nancy.ModelBinding;
using NLog;
@@ -11,6 +12,10 @@ using Lidarr.Http.Extensions;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Indexers;
using Lidarr.Http.REST;
using System;
using NzbDrone.Core.Exceptions;
using HttpStatusCode = System.Net.HttpStatusCode;
namespace Lidarr.Api.V1.Indexers
{
@@ -20,6 +25,7 @@ namespace Lidarr.Api.V1.Indexers
private readonly IProcessDownloadDecisions _downloadDecisionProcessor;
private readonly IIndexerFactory _indexerFactory;
private readonly Logger _logger;
private ResourceValidator<ReleaseResource> _releaseValidator;
public ReleasePushModule(IMakeDownloadDecision downloadDecisionMaker,
IProcessDownloadDecisions downloadDecisionProcessor,
@@ -31,19 +37,39 @@ namespace Lidarr.Api.V1.Indexers
_indexerFactory = indexerFactory;
_logger = logger;
Post["/push"] = x => ProcessRelease(this.Bind<ReleaseResource>());
_releaseValidator = new ResourceValidator<ReleaseResource>();
_releaseValidator.RuleFor(s => s.Title).NotEmpty();
_releaseValidator.RuleFor(s => s.DownloadUrl).NotEmpty();
_releaseValidator.RuleFor(s => s.DownloadProtocol).NotEmpty();
_releaseValidator.RuleFor(s => s.PublishDate).NotEmpty();
PostValidator.RuleFor(s => s.Title).NotEmpty();
PostValidator.RuleFor(s => s.DownloadUrl).NotEmpty();
PostValidator.RuleFor(s => s.DownloadProtocol).NotEmpty();
PostValidator.RuleFor(s => s.PublishDate).NotEmpty();
Post["/push"] = x => ProcessRelease();
}
private Response ProcessRelease(ReleaseResource release)
private Response ProcessRelease()
{
_logger.Info("Release pushed: {0} - {1}", release.Title, release.DownloadUrl);
var info = release.ToModel();
var resource = new ReleaseResource();
try
{
resource = Request.Body.FromJson<ReleaseResource>();
}
catch (Exception ex)
{
throw new NzbDroneClientException(HttpStatusCode.BadRequest, ex.Message);
}
var validationFailures = _releaseValidator.Validate(resource).Errors;
if (validationFailures.Any())
{
throw new ValidationException(validationFailures);
}
_logger.Info("Release pushed: {0} - {1}", resource.Title, resource.DownloadUrl);
var info = resource.ToModel();
info.Guid = "PUSH-" + info.DownloadUrl;
@@ -52,7 +78,14 @@ namespace Lidarr.Api.V1.Indexers
var decisions = _downloadDecisionMaker.GetRssDecision(new List<ReleaseInfo> { info });
_downloadDecisionProcessor.ProcessDecisions(decisions);
return MapDecisions(decisions).First().AsResponse();
var firstDecision = decisions.FirstOrDefault();
if (firstDecision?.RemoteAlbum.ParsedAlbumInfo == null)
{
throw new ValidationException(new List<ValidationFailure> { new ValidationFailure("Title", "Unable to parse", resource.Title) });
}
return MapDecisions(new[] { firstDecision }).AsResponse();
}
private void ResolveIndexer(ReleaseInfo release)