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

ReleasePushModule uses ReadResourceFromRequest

This commit is contained in:
Mark McDowall 2019-04-05 20:23:59 -07:00
parent 2b63110323
commit 7d131fbb3d
2 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/NzbDrone.Api/Indexers/ReleasePushModule.cs
View File

@ -2,7 +2,6 @@
using System.Linq; using System.Linq;
using FluentValidation; using FluentValidation;
using Nancy; using Nancy;
using Nancy.ModelBinding;
using NLog; using NLog;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
using NzbDrone.Core.Datastore; using NzbDrone.Core.Datastore;
@ -11,7 +10,6 @@ using NzbDrone.Core.Download;
using NzbDrone.Core.Indexers; using NzbDrone.Core.Indexers;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using Sonarr.Http.Extensions; using Sonarr.Http.Extensions;
using Sonarr.Http.REST;
namespace NzbDrone.Api.Indexers namespace NzbDrone.Api.Indexers
{ {
@ -20,7 +18,6 @@ namespace NzbDrone.Api.Indexers
private readonly IMakeDownloadDecision _downloadDecisionMaker; private readonly IMakeDownloadDecision _downloadDecisionMaker;
private readonly IProcessDownloadDecisions _downloadDecisionProcessor; private readonly IProcessDownloadDecisions _downloadDecisionProcessor;
private readonly IIndexerFactory _indexerFactory; private readonly IIndexerFactory _indexerFactory;
private ResourceValidator<ReleaseResource> _releaseValidator;
private readonly Logger _logger; private readonly Logger _logger;
public ReleasePushModule(IMakeDownloadDecision downloadDecisionMaker, public ReleasePushModule(IMakeDownloadDecision downloadDecisionMaker,
@ -33,24 +30,16 @@ namespace NzbDrone.Api.Indexers
_indexerFactory = indexerFactory; _indexerFactory = indexerFactory;
_logger = logger; _logger = logger;
Post["/push"] = x => ProcessRelease(this.Bind<ReleaseResource>()); Post["/push"] = x => ProcessRelease(ReadResourceFromRequest());
_releaseValidator = new ResourceValidator<ReleaseResource>(); PostValidator.RuleFor(s => s.Title).NotEmpty();
_releaseValidator.RuleFor(s => s.Title).NotEmpty(); PostValidator.RuleFor(s => s.DownloadUrl).NotEmpty();
_releaseValidator.RuleFor(s => s.DownloadUrl).NotEmpty(); PostValidator.RuleFor(s => s.DownloadProtocol).NotEmpty();
_releaseValidator.RuleFor(s => s.DownloadProtocol).NotEmpty(); PostValidator.RuleFor(s => s.PublishDate).NotEmpty();
_releaseValidator.RuleFor(s => s.PublishDate).NotEmpty();
} }
private Response ProcessRelease(ReleaseResource release) private Response ProcessRelease(ReleaseResource release)
{ {
var validationFailures = _releaseValidator.Validate(release).Errors;
if (validationFailures.Any())
{
throw new ValidationException(validationFailures);
}
_logger.Info("Release pushed: {0} - {1}", release.Title, release.DownloadUrl); _logger.Info("Release pushed: {0} - {1}", release.Title, release.DownloadUrl);
var info = release.ToModel(); var info = release.ToModel();

21
src/Sonarr.Api.V3/Indexers/ReleasePushModule.cs
View File

@ -3,7 +3,6 @@ using System.Linq;
using FluentValidation; using FluentValidation;
using FluentValidation.Results; using FluentValidation.Results;
using Nancy; using Nancy;
using Nancy.ModelBinding;
using NLog; using NLog;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
using NzbDrone.Core.Datastore; using NzbDrone.Core.Datastore;
@ -12,7 +11,6 @@ using NzbDrone.Core.Download;
using NzbDrone.Core.Indexers; using NzbDrone.Core.Indexers;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using Sonarr.Http.Extensions; using Sonarr.Http.Extensions;
using Sonarr.Http.REST;
namespace Sonarr.Api.V3.Indexers namespace Sonarr.Api.V3.Indexers
{ {
@ -21,7 +19,6 @@ namespace Sonarr.Api.V3.Indexers
private readonly IMakeDownloadDecision _downloadDecisionMaker; private readonly IMakeDownloadDecision _downloadDecisionMaker;
private readonly IProcessDownloadDecisions _downloadDecisionProcessor; private readonly IProcessDownloadDecisions _downloadDecisionProcessor;
private readonly IIndexerFactory _indexerFactory; private readonly IIndexerFactory _indexerFactory;
private ResourceValidator<ReleaseResource> _releaseValidator;
private readonly Logger _logger; private readonly Logger _logger;
public ReleasePushModule(IMakeDownloadDecision downloadDecisionMaker, public ReleasePushModule(IMakeDownloadDecision downloadDecisionMaker,
@ -34,24 +31,16 @@ namespace Sonarr.Api.V3.Indexers
_indexerFactory = indexerFactory; _indexerFactory = indexerFactory;
_logger = logger; _logger = logger;
_releaseValidator = new ResourceValidator<ReleaseResource>(); PostValidator.RuleFor(s => s.Title).NotEmpty();
_releaseValidator.RuleFor(s => s.Title).NotEmpty(); PostValidator.RuleFor(s => s.DownloadUrl).NotEmpty();
_releaseValidator.RuleFor(s => s.DownloadUrl).NotEmpty(); PostValidator.RuleFor(s => s.DownloadProtocol).NotEmpty();
_releaseValidator.RuleFor(s => s.DownloadProtocol).NotEmpty(); PostValidator.RuleFor(s => s.PublishDate).NotEmpty();
_releaseValidator.RuleFor(s => s.PublishDate).NotEmpty();
Post["/push"] = x => ProcessRelease(this.Bind<ReleaseResource>()); Post["/push"] = x => ProcessRelease(ReadResourceFromRequest());
} }
private Response ProcessRelease(ReleaseResource release) private Response ProcessRelease(ReleaseResource release)
{ {
var validationFailures = _releaseValidator.Validate(release).Errors;
if (validationFailures.Any())
{
throw new ValidationException(validationFailures);
}
_logger.Info("Release pushed: {0} - {1}", release.Title, release.DownloadUrl); _logger.Info("Release pushed: {0} - {1}", release.Title, release.DownloadUrl);
var info = release.ToModel(); var info = release.ToModel();