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

Some rules #865

Browse Source
pull/1488/head
Jamie.Rees 7 years ago
parent d73899fc53
commit 974cb1ebb3
22 changed files with 289 additions and 131 deletions
Show Stats Download Patch File Download Diff File

25
src/Ombi.Core.Tests/Rule/Request/AutoApproveRuleTests.cs
Unescape View File

@ -1,4 +1,5 @@
using System.Security.Principal;
using System.Threading.Tasks;
using Moq;
using Ombi.Core.Claims;
using Ombi.Core.Models.Requests;
@ -20,64 +21,64 @@ namespace Ombi.Core.Tests.Rule
private Mock<IPrincipal> PrincipalMock { get; }
[Fact]
public void Should_ReturnSuccess_WhenAdminAndRequestMovie()
public async Task Should_ReturnSuccess_WhenAdminAndRequestMovie()
{
PrincipalMock.Setup(x => x.IsInRole(OmbiClaims.Admin)).Returns(true);
var request = new BaseRequestModel() { Type = Store.Entities.RequestType.Movie };
var result = Rule.Execute(request);
var result = await Rule.Execute(request);
Assert.Equal(result.Success, true);
Assert.Equal(request.Approved, true);
}
[Fact]
public void Should_ReturnSuccess_WhenAdminAndRequestTV()
public async Task Should_ReturnSuccess_WhenAdminAndRequestTV()
{
PrincipalMock.Setup(x => x.IsInRole(OmbiClaims.Admin)).Returns(true);
var request = new BaseRequestModel() { Type = Store.Entities.RequestType.TvShow };
var result = Rule.Execute(request);
var result = await Rule.Execute(request);
Assert.Equal(result.Success, true);
Assert.Equal(request.Approved, true);
}
[Fact]
public void Should_ReturnSuccess_WhenAutoApproveMovieAndRequestMovie()
public async Task Should_ReturnSuccess_WhenAutoApproveMovieAndRequestMovie()
{
PrincipalMock.Setup(x => x.IsInRole(OmbiClaims.AutoApproveMovie)).Returns(true);
var request = new BaseRequestModel() { Type = Store.Entities.RequestType.Movie };
var result = Rule.Execute(request);
var result = await Rule.Execute(request);
Assert.Equal(result.Success, true);
Assert.Equal(request.Approved, true);
}
[Fact]
public void Should_ReturnSuccess_WhenAutoApproveTVAndRequestTV()
public async Task Should_ReturnSuccess_WhenAutoApproveTVAndRequestTV()
{
PrincipalMock.Setup(x => x.IsInRole(OmbiClaims.AutoApproveTv)).Returns(true);
var request = new BaseRequestModel() { Type = Store.Entities.RequestType.TvShow };
var result = Rule.Execute(request);
var result = await Rule.Execute(request);
Assert.Equal(result.Success, true);
Assert.Equal(request.Approved, true);
}
[Fact]
public void Should_ReturnFail_WhenNoClaimsAndRequestMovie()
public async Task Should_ReturnFail_WhenNoClaimsAndRequestMovie()
{
var request = new BaseRequestModel() { Type = Store.Entities.RequestType.Movie };
var result = Rule.Execute(request);
var result = await Rule.Execute(request);
Assert.Equal(result.Success, true);
Assert.Equal(request.Approved, false);
}
[Fact]
public void Should_ReturnFail_WhenNoClaimsAndRequestTV()
public async Task Should_ReturnFail_WhenNoClaimsAndRequestTV()
{
var request = new BaseRequestModel() { Type = Store.Entities.RequestType.TvShow };
var result = Rule.Execute(request);
var result = await Rule.Execute(request);
Assert.Equal(result.Success, true);
Assert.Equal(request.Approved, false);

25
src/Ombi.Core.Tests/Rule/Request/CanRequestRuleTests.cs
Unescape View File

@ -1,4 +1,5 @@
using System.Security.Principal;
using System.Threading.Tasks;
using Moq;
using Ombi.Core.Claims;
using Ombi.Core.Models.Requests;
@ -19,62 +20,62 @@ namespace Ombi.Core.Tests.Rule
private Mock<IPrincipal> PrincipalMock { get; }
[Fact]
public void Should_ReturnSuccess_WhenRequestingMovieWithMovieRole()
public async Task Should_ReturnSuccess_WhenRequestingMovieWithMovieRole()
{
PrincipalMock.Setup(x => x.IsInRole(OmbiClaims.RequestMovie)).Returns(true);
var request = new BaseRequestModel() { Type = Store.Entities.RequestType.Movie };
var result = Rule.Execute(request);
var result = await Rule.Execute(request);
Assert.Equal(result.Success, true);
}
[Fact]
public void Should_ReturnFail_WhenRequestingMovieWithoutMovieRole()
public async Task Should_ReturnFail_WhenRequestingMovieWithoutMovieRole()
{
PrincipalMock.Setup(x => x.IsInRole(OmbiClaims.RequestMovie)).Returns(false);
var request = new BaseRequestModel() { Type = Store.Entities.RequestType.Movie };
var result = Rule.Execute(request);
var result = await Rule.Execute(request);
Assert.Equal(result.Success, false);
Assert.Equal(string.IsNullOrEmpty(result.Message), false);
}
[Fact]
public void Should_ReturnSuccess_WhenRequestingMovieWithAdminRole()
public async Task Should_ReturnSuccess_WhenRequestingMovieWithAdminRole()
{
PrincipalMock.Setup(x => x.IsInRole(OmbiClaims.Admin)).Returns(true);
var request = new BaseRequestModel() { Type = Store.Entities.RequestType.Movie };
var result = Rule.Execute(request);
var result = await Rule.Execute(request);
Assert.Equal(result.Success, true);
}
[Fact]
public void Should_ReturnSuccess_WhenRequestingTVWithAdminRole()
public async Task Should_ReturnSuccess_WhenRequestingTVWithAdminRole()
{
PrincipalMock.Setup(x => x.IsInRole(OmbiClaims.Admin)).Returns(true);
var request = new BaseRequestModel() { Type = Store.Entities.RequestType.TvShow };
var result = Rule.Execute(request);
var result = await Rule.Execute(request);
Assert.Equal(result.Success, true);
}
[Fact]
public void Should_ReturnSuccess_WhenRequestingTVWithTVRole()
public async Task Should_ReturnSuccess_WhenRequestingTVWithTVRole()
{
PrincipalMock.Setup(x => x.IsInRole(OmbiClaims.RequestTv)).Returns(true);
var request = new BaseRequestModel() { Type = Store.Entities.RequestType.TvShow };
var result = Rule.Execute(request);
var result = await Rule.Execute(request);
Assert.Equal(result.Success, true);
}
[Fact]
public void Should_ReturnFail_WhenRequestingTVWithoutTVRole()
public async Task Should_ReturnFail_WhenRequestingTVWithoutTVRole()
{
PrincipalMock.Setup(x => x.IsInRole(OmbiClaims.RequestTv)).Returns(false);
var request = new BaseRequestModel() { Type = Store.Entities.RequestType.TvShow };
var result = Rule.Execute(request);
var result = await Rule.Execute(request);
Assert.Equal(result.Success, false);
Assert.Equal(string.IsNullOrEmpty(result.Message), false);

51
src/Ombi.Core.Tests/Rule/Search/ExistingRequestRuleTests.cs
Unescape View File

@ -0,0 +1,51 @@
using System.Threading.Tasks;
using Moq;
using Ombi.Core.Models.Requests;
using Ombi.Core.Models.Requests.Movie;
using Ombi.Core.Models.Search;
using Ombi.Core.Requests.Models;
using Ombi.Core.Rule.Rules.Search;
using Ombi.Store.Context;
using Ombi.Store.Entities;
using Ombi.Store.Repository;
using Xunit;
namespace Ombi.Core.Tests.Rule.Search
{
public class ExistignRequestRuleTests
{
public ExistignRequestRuleTests()
{
MovieMock = new Mock<IRequestService<MovieRequestModel>>();
TvMock = new Mock<IRequestService<TvRequestModel>>();
Rule = new ExistingRequestRule(MovieMock.Object, TvMock.Object);
}
private ExistingRequestRule Rule { get; }
private Mock<IRequestService<MovieRequestModel>> MovieMock { get; }
private Mock<IRequestService<TvRequestModel>> TvMock { get; }
// TODO continue tests
// https://stackoverflow.com/questions/27483709/testing-ef-async-methods-with-sync-methods-with-moq
public async Task ShouldBe_Requested_WhenExisitngMovie()
{
var list = DbHelper.GetQueryableMockDbSet(new MovieRequestModel
{
ProviderId = 123,
Approved = true
});
MovieMock.Setup(x => x.GetAllQueryable()).Returns(list);
var search = new SearchMovieViewModel
{
Id = 123,
};
var result = await Rule.Execute(search);
Assert.True(result.Success);
Assert.Equal(search.Approved, true);
}
}
}

50
src/Ombi.Core.Tests/Rule/Search/PlexAvailabilityRuleTests.cs
Unescape View File

@ -0,0 +1,50 @@
using System.Threading.Tasks;
using Moq;
using Ombi.Core.Models.Search;
using Ombi.Core.Rule.Rules.Search;
using Ombi.Store.Context;
using Ombi.Store.Entities;
using Ombi.Store.Repository;
using Xunit;
namespace Ombi.Core.Tests.Rule.Search
{
public class PlexAvailabilityRuleTests
{
public PlexAvailabilityRuleTests()
{
ContextMock = new Mock<IPlexContentRepository>();
Rule = new PlexAvailabilityRule(ContextMock.Object);
}
private PlexAvailabilityRule Rule { get; }
private Mock<IPlexContentRepository> ContextMock { get; }
[Fact]
public async Task ShouldBe_Available_WhenFoundInPlex()
{
ContextMock.Setup(x => x.Get(It.IsAny<string>())).ReturnsAsync(new PlexContent
{
Url = "TestUrl"
});
var search = new SearchMovieViewModel();
var result = await Rule.Execute(search);
Assert.True(result.Success);
Assert.Equal(search.PlexUrl, "TestUrl");
Assert.Equal(search.Available, true);
}
[Fact]
public async Task ShouldBe_NotAvailable_WhenNotFoundInPlex()
{
ContextMock.Setup(x => x.Get(It.IsAny<string>())).Returns(Task.FromResult(default(PlexContent)));
var search = new SearchMovieViewModel();
var result = await Rule.Execute(search);
Assert.True(result.Success);
Assert.Equal(search.PlexUrl, null);
Assert.Equal(search.Available, false);
}
}
}

9
src/Ombi.Core.Tests/Rule/Search/RadarrCacheRuleTests.cs
Unescape View File

@ -1,3 +1,4 @@
using System.Threading.Tasks;
using Moq;
using Ombi.Core.Models.Search;
using Ombi.Core.Rule.Rules.Search;
@ -19,7 +20,7 @@ namespace Ombi.Core.Tests.Rule.Search
private Mock<IOmbiContext> ContextMock { get; }
[Fact]
public void Should_ReturnApproved_WhenMovieIsInRadarr()
public async Task Should_ReturnApproved_WhenMovieIsInRadarr()
{
var list = DbHelper.GetQueryableMockDbSet(new RadarrCache
{
@ -29,7 +30,7 @@ namespace Ombi.Core.Tests.Rule.Search
ContextMock.Setup(x => x.RadarrCache).Returns(list);
var request = new SearchMovieViewModel { Id = 123 };
var result = Rule.Execute(request);
var result =await Rule.Execute(request);
Assert.Equal(result.Success, true);
Assert.Equal(request.Approved, true);
@ -37,7 +38,7 @@ namespace Ombi.Core.Tests.Rule.Search
[Fact]
public void Should_ReturnNotApproved_WhenMovieIsNotInRadarr()
public async Task Should_ReturnNotApproved_WhenMovieIsNotInRadarr()
{
var list = DbHelper.GetQueryableMockDbSet(new RadarrCache
{
@ -47,7 +48,7 @@ namespace Ombi.Core.Tests.Rule.Search
ContextMock.Setup(x => x.RadarrCache).Returns(list);
var request = new SearchMovieViewModel { Id = 123 };
var result = Rule.Execute(request);
var result = await Rule.Execute(request);
Assert.Equal(result.Success, true);
Assert.Equal(request.Approved, false);

9
src/Ombi.Core/Engine/Interfaces/BaseEngine.cs
Unescape View File

@ -7,6 +7,7 @@ using Ombi.Store.Entities;
using System.Collections.Generic;
using System.Linq;
using System.Security.Principal;
using System.Threading.Tasks;
using Hangfire;
using Ombi.Core.Models.Requests.Movie;
using Ombi.Core.Models.Search;
@ -64,15 +65,15 @@ namespace Ombi.Core.Engine.Interfaces
}
}
public IEnumerable<RuleResult> RunRequestRules(BaseRequestModel model)
public async Task<IEnumerable<RuleResult>> RunRequestRules(BaseRequestModel model)
{
var ruleResults = Rules.StartRequestRules(model).ToList();
var ruleResults = await Rules.StartRequestRules(model);
return ruleResults;
}
public IEnumerable<RuleResult> RunSearchRules(SearchViewModel model)
public async Task<IEnumerable<RuleResult>> RunSearchRules(SearchViewModel model)
{
var ruleResults = Rules.StartSearchRules(model).ToList();
var ruleResults = await Rules.StartSearchRules(model);
return ruleResults;
}
}

14
src/Ombi.Core/Engine/MovieRequestEngine.cs
Unescape View File

@ -14,6 +14,7 @@ using System.Security.Principal;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Ombi.Core.Engine.Interfaces;
using Ombi.Core.Rule;
namespace Ombi.Core.Engine
{
@ -37,22 +38,26 @@ namespace Ombi.Core.Engine
{
var movieInfo = await MovieApi.GetMovieInformation(model.Id);
if (movieInfo == null)
{
return new RequestEngineResult
{
RequestAdded = false,
Message = "There was an issue adding this movie!",
ErrorMessage = $"TheMovieDb didn't have any information for ID {model.Id}"
};
}
var fullMovieName =
$"{movieInfo.Title}{(!string.IsNullOrEmpty(movieInfo.ReleaseDate) ? $" ({DateTime.Parse(movieInfo.ReleaseDate).Year})" : string.Empty)}";
var existingRequest = await MovieRequestService.CheckRequestAsync(model.Id);
if (existingRequest != null)
{
return new RequestEngineResult
{
RequestAdded = false,
Message = $"{fullMovieName} has already been requested"
};
}
// TODO
//try
@ -99,12 +104,13 @@ namespace Ombi.Core.Engine
Issues = IssueState.None
};
var ruleResults = RunRequestRules(requestModel).ToList();
if (ruleResults.Any(x => !x.Success))
var ruleResults = await RunRequestRules(requestModel);
var results = ruleResults as RuleResult[] ?? ruleResults.ToArray();
if (results.Any(x => !x.Success))
{
return new RequestEngineResult
{
ErrorMessage = ruleResults.FirstOrDefault(x => !string.IsNullOrEmpty(x.Message)).Message
ErrorMessage = results.FirstOrDefault(x => !string.IsNullOrEmpty(x.Message)).Message
};
}
@ -186,7 +192,7 @@ namespace Ombi.Core.Engine
{
NotificationHelper.NewRequest(model);
}
//var limit = await RequestLimitRepo.GetAllAsync();
//var usersLimit = limit.FirstOrDefault(x => x.Username == Username && x.RequestType == model.Type);
//if (usersLimit == null)

49
src/Ombi.Core/Engine/MovieSearchEngine.cs
Unescape View File

@ -3,7 +3,6 @@ using Microsoft.Extensions.Logging;
using Ombi.Api.TheMovieDb;
using Ombi.Api.TheMovieDb.Models;
using Ombi.Core.Models.Requests;
using Ombi.Core.Models.Requests.Movie;
using Ombi.Core.Models.Search;
using Ombi.Core.Rules;
using Ombi.Core.Settings;
@ -49,7 +48,6 @@ namespace Ombi.Core.Engine
return new List<SearchMovieViewModel>();
var retVal = new List<SearchMovieViewModel>();
var dbMovies = await GetMovieRequests();
var plexSettings = await PlexSettings.GetSettingsAsync();
var embySettings = await EmbySettings.GetSettingsAsync();
@ -59,22 +57,20 @@ namespace Ombi.Core.Engine
var movieInfo = await MovieApi.GetMovieInformationWithVideo(m.Id);
var viewMovie = Mapper.Map<SearchMovieViewModel>(movieInfo);
retVal.Add(await ProcessSingleMovie(viewMovie, dbMovies, plexSettings, embySettings));
retVal.Add(await ProcessSingleMovie(viewMovie, plexSettings, embySettings));
}
return retVal;
}
public async Task<SearchMovieViewModel> LookupImdbInformation(int theMovieDbId)
{
var dbMovies = await GetMovieRequests();
var plexSettings = await PlexSettings.GetSettingsAsync();
var embySettings = await EmbySettings.GetSettingsAsync();
var movieInfo = await MovieApi.GetMovieInformationWithVideo(theMovieDbId);
var viewMovie = Mapper.Map<SearchMovieViewModel>(movieInfo);
return await ProcessSingleMovie(viewMovie, dbMovies, plexSettings, embySettings, true);
return await ProcessSingleMovie(viewMovie, plexSettings, embySettings, true);
}
public async Task<IEnumerable<SearchMovieViewModel>> Search(string search)
@ -148,25 +144,22 @@ namespace Ombi.Core.Engine
{
var viewMovies = new List<SearchMovieViewModel>();
Dictionary<int, MovieRequestModel> dbMovies;
Settings.Models.External.PlexSettings plexSettings;
Settings.Models.External.EmbySettings embySettings;
using (MiniProfiler.Current.Step("Gettings Movies and Settings"))
{
dbMovies = await GetMovieRequests();
plexSettings = await PlexSettings.GetSettingsAsync();
embySettings = await EmbySettings.GetSettingsAsync();
}
foreach (var movie in movies)
{
viewMovies.Add(await ProcessSingleMovie(movie, dbMovies, plexSettings, embySettings));
viewMovies.Add(await ProcessSingleMovie(movie, plexSettings, embySettings));
}
return viewMovies;
}
private async Task<SearchMovieViewModel> ProcessSingleMovie(SearchMovieViewModel viewMovie,
Dictionary<int, MovieRequestModel> existingRequests, PlexSettings plexSettings, EmbySettings embySettings, bool lookupExtraInfo = false)
PlexSettings plexSettings, EmbySettings embySettings, bool lookupExtraInfo = false)
{
if (plexSettings.Enable)
@ -175,25 +168,7 @@ namespace Ombi.Core.Engine
{
var showInfo = await MovieApi.GetMovieInformation(viewMovie.Id);
viewMovie.Id = showInfo.Id; // TheMovieDbId
var item = await PlexContentRepo.Get(showInfo.ImdbId);
if (item != null)
{
viewMovie.Available = true;
viewMovie.PlexUrl = item.Url;
}
}
// var content = PlexContentRepository.GetAll();
// var plexMovies = PlexChecker.GetPlexMovies(content);
// var plexMovie = PlexChecker.GetMovie(plexMovies.ToArray(), movie.Title,
// movie.ReleaseDate?.Year.ToString(),
// viewMovie.ImdbId);
// if (plexMovie != null)
// {
// viewMovie.Available = true;
// viewMovie.PlexUrl = plexMovie.Url;
// }
}
if (embySettings.Enable)
{
@ -208,26 +183,16 @@ namespace Ombi.Core.Engine
// }
}
if (existingRequests.ContainsKey(viewMovie.Id)) // Do we already have a request for this?
{
var requestedMovie = existingRequests[viewMovie.Id];
viewMovie.Requested = true;
viewMovie.Approved = requestedMovie.Approved;
viewMovie.Available = requestedMovie.Available;
}
RunSearchRules(viewMovie);
await RunSearchRules(viewMovie);
return viewMovie;
}
private async Task<SearchMovieViewModel> ProcessSingleMovie(MovieSearchResult movie,
Dictionary<int, MovieRequestModel> existingRequests, PlexSettings plexSettings, EmbySettings embySettings)
private async Task<SearchMovieViewModel> ProcessSingleMovie(MovieSearchResult movie, PlexSettings plexSettings, EmbySettings embySettings)
{
var viewMovie = Mapper.Map<SearchMovieViewModel>(movie);
return await ProcessSingleMovie(viewMovie, existingRequests, plexSettings, embySettings);
return await ProcessSingleMovie(viewMovie, plexSettings, embySettings);
}
}
}

8
src/Ombi.Core/Engine/TvRequestEngine.cs
Unescape View File

@ -15,6 +15,7 @@ using System.Linq;
using System.Security.Principal;
using System.Threading.Tasks;
using Ombi.Core.Engine.Interfaces;
using Ombi.Core.Rule;
namespace Ombi.Core.Engine
{
@ -141,12 +142,13 @@ namespace Ombi.Core.Engine
}
}
var ruleResults = RunRequestRules(model).ToList();
if (ruleResults.Any(x => !x.Success))
var ruleResults = await RunRequestRules(model);
var results = ruleResults as RuleResult[] ?? ruleResults.ToArray();
if (results.Any(x => !x.Success))
{
return new RequestEngineResult
{
ErrorMessage = ruleResults.FirstOrDefault(x => !string.IsNullOrEmpty(x.Message)).Message
ErrorMessage = results.FirstOrDefault(x => !string.IsNullOrEmpty(x.Message)).Message
};
}

5
src/Ombi.Core/Rule/Interfaces/IRequestRules.cs
Unescape View File

@ -1,9 +1,10 @@
using Ombi.Core.Models.Requests;
using System.Threading.Tasks;
using Ombi.Core.Models.Requests;
namespace Ombi.Core.Rule.Interfaces
{
public interface IRequestRules<T> where T : new()
{
RuleResult Execute(T obj);
Task<RuleResult> Execute(T obj);
}
}

5
src/Ombi.Core/Rule/Interfaces/IRuleEvaluator.cs
Unescape View File

@ -1,13 +1,14 @@
using Ombi.Core.Models.Requests;
using Ombi.Core.Rule;
using System.Collections.Generic;
using System.Threading.Tasks;
using Ombi.Core.Models.Search;
namespace Ombi.Core.Rules
{
public interface IRuleEvaluator
{
IEnumerable<RuleResult> StartRequestRules(BaseRequestModel obj);
IEnumerable<RuleResult> StartSearchRules(SearchViewModel obj);
Task<IEnumerable<RuleResult>> StartRequestRules(BaseRequestModel obj);
Task<IEnumerable<RuleResult>> StartSearchRules(SearchViewModel obj);
}
}

9
src/Ombi.Core/Rule/RuleEvaluator.cs
Unescape View File

@ -4,6 +4,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using Ombi.Core.Models.Search;
using Ombi.Core.Rule.Interfaces;
@ -62,24 +63,24 @@ namespace Ombi.Core.Rule
private List<IRequestRules<BaseRequestModel>> RequestRules { get; }
private List<IRequestRules<SearchViewModel>> SearchRules { get; }
public IEnumerable<RuleResult> StartRequestRules(BaseRequestModel obj)
public async Task<IEnumerable<RuleResult>> StartRequestRules(BaseRequestModel obj)
{
var results = new List<RuleResult>();
foreach (var rule in RequestRules)
{
var result = rule.Execute(obj);
var result = await rule.Execute(obj);
results.Add(result);
}
return results;
}
public IEnumerable<RuleResult> StartSearchRules(SearchViewModel obj)
public async Task<IEnumerable<RuleResult>> StartSearchRules(SearchViewModel obj)
{
var results = new List<RuleResult>();
foreach (var rule in SearchRules)
{
var result = rule.Execute(obj);
var result = await rule.Execute(obj);
results.Add(result);
}

7
src/Ombi.Core/Rule/Rules/Request/AutoApproveRule.cs
Unescape View File

@ -1,4 +1,5 @@
using System.Security.Principal;
using System.Threading.Tasks;
using Ombi.Core.Claims;
using Ombi.Core.Models.Requests;
using Ombi.Core.Rule.Interfaces;
@ -15,19 +16,19 @@ namespace Ombi.Core.Rule.Rules.Request
private IPrincipal User { get; }
public RuleResult Execute(BaseRequestModel obj)
public Task<RuleResult> Execute(BaseRequestModel obj)
{
if (User.IsInRole(OmbiClaims.Admin))
{
obj.Approved = true;
return Success();
return Task.FromResult(Success());
}
if (obj.Type == RequestType.Movie && User.IsInRole(OmbiClaims.AutoApproveMovie))
obj.Approved = true;
if (obj.Type == RequestType.TvShow && User.IsInRole(OmbiClaims.AutoApproveTv))
obj.Approved = true;
return Success(); // We don't really care, we just don't set the obj to approve
return Task.FromResult(Success()); // We don't really care, we just don't set the obj to approve
}
}
}

13
src/Ombi.Core/Rule/Rules/Request/CanRequestRule.cs
Unescape View File

@ -3,6 +3,7 @@ using Ombi.Core.Models.Requests;
using Ombi.Core.Rules;
using Ombi.Store.Entities;
using System.Security.Principal;
using System.Threading.Tasks;
using Ombi.Core.Rule.Interfaces;
namespace Ombi.Core.Rule.Rules
@ -16,21 +17,21 @@ namespace Ombi.Core.Rule.Rules
private IPrincipal User { get; }
public RuleResult Execute(BaseRequestModel obj)
public Task<RuleResult> Execute(BaseRequestModel obj)
{
if (User.IsInRole(OmbiClaims.Admin))
return Success();
return Task.FromResult(Success());
if (obj.Type == RequestType.Movie)
{
if (User.IsInRole(OmbiClaims.RequestMovie))
return Success();
return Fail("You do not have permissions to Request a Movie");
return Task.FromResult(Success());
return Task.FromResult(Fail("You do not have permissions to Request a Movie"));
}
if (User.IsInRole(OmbiClaims.RequestTv))
return Success();
return Fail("You do not have permissions to Request a Movie");
return Task.FromResult(Success());
return Task.FromResult(Fail("You do not have permissions to Request a Movie"));
}
}
}

50
src/Ombi.Core/Rule/Rules/Search/ExistingRequestRule.cs
Unescape View File

@ -0,0 +1,50 @@
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using Ombi.Core.Models.Requests;
using Ombi.Core.Models.Requests.Movie;
using Ombi.Core.Models.Search;
using Ombi.Core.Requests.Models;
using Ombi.Core.Rule.Interfaces;
namespace Ombi.Core.Rule.Rules.Search
{
public class ExistingRequestRule : BaseSearchRule, IRequestRules<SearchViewModel>
{
public ExistingRequestRule(IRequestService<MovieRequestModel> movie, IRequestService<TvRequestModel> tv)
{
Movie = movie;
Tv = tv;
}
private IRequestService<MovieRequestModel> Movie { get; }
private IRequestService<TvRequestModel> Tv { get; }
public async Task<RuleResult> Execute(SearchViewModel obj)
{
var movieRequests = Movie.GetAllQueryable();
var existing = await movieRequests.FirstOrDefaultAsync(x => x.ProviderId == obj.Id);
if (existing != null) // Do we already have a request for this?
{
obj.Requested = true;
obj.Approved = existing.Approved;
obj.Available = existing.Available;
return Success();
}
var tvRequests = Tv.GetAllQueryable();
var movieExisting = await tvRequests.FirstOrDefaultAsync(x => x.ProviderId == obj.Id);
if (movieExisting != null) // Do we already have a request for this?
{
obj.Requested = true;
obj.Approved = movieExisting.Approved;
obj.Available = movieExisting.Available;
return Success();
}
return Success();
}
}
}

28
src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs
Unescape View File

@ -0,0 +1,28 @@
using System.Threading.Tasks;
using Ombi.Core.Models.Search;
using Ombi.Core.Rule.Interfaces;
using Ombi.Store.Repository;
namespace Ombi.Core.Rule.Rules.Search
{
public class PlexAvailabilityRule : BaseSearchRule, IRequestRules<SearchViewModel>
{
public PlexAvailabilityRule(IPlexContentRepository repo)
{
PlexContentRepository = repo;
}
private IPlexContentRepository PlexContentRepository { get; }
public async Task<RuleResult> Execute(SearchViewModel obj)
{
var item = await PlexContentRepository.Get(obj.Id.ToString());
if (item != null)
{
obj.Available = true;
obj.PlexUrl = item.Url;
}
return Success();
}
}
}

7
src/Ombi.Core/Rule/Rules/Search/RadarrCacheRule.cs
Unescape View File

@ -1,5 +1,5 @@
using System.Linq;
using Ombi.Core.Models.Requests;
using System.Threading.Tasks;
using Ombi.Core.Models.Search;
using Ombi.Core.Rule.Interfaces;
using Ombi.Store.Context;
@ -15,17 +15,16 @@ namespace Ombi.Core.Rule.Rules.Search
private readonly IOmbiContext _ctx;
public RuleResult Execute(SearchViewModel obj)
public Task<RuleResult> Execute(SearchViewModel obj)
{
// Check if it's in Radarr
var result = _ctx.RadarrCache.FirstOrDefault(x => x.TheMovieDbId == obj.Id);
if (result != null)
{
obj.Approved = true; // It's in radarr so it's approved... Maybe have a new property called "Processing" or something?
}
return Success();
return Task.FromResult(Success());
}
}
}

1
src/Ombi.Notifications/NotificationService.cs
Unescape View File

@ -6,6 +6,7 @@ using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Ombi.Core.Notifications;
using Ombi.Helpers;
using Ombi.Notifications.Interfaces;
using Ombi.Notifications.Models;
namespace Ombi.Notifications

2
src/Ombi/ClientApp/app/settings/notifications/discord.component.ts
Unescape View File

@ -58,7 +58,7 @@ export class DiscordComponent implements OnInit {
return
}
this.testerService.discordTest(form.value).subscribex(x => {
this.testerService.discordTest(form.value).subscribe(x => {
if (x) {
this.notificationService.success("Successful", "Successfully sent a Discord message, please check the discord channel");
} else {

39
src/Ombi/ClientApp/app/settings/sonarr/sonarr.component.ts
Unescape View File

@ -9,7 +9,7 @@ import { SonarrService } from '../../services/applications/sonarr.service';
import { NotificationService } from "../../services/notification.service";
@Component({
templateUrl: './sonarr.component.html',
})
export class SonarrComponent implements OnInit, OnDestroy {
@ -43,11 +43,11 @@ export class SonarrComponent implements OnInit, OnDestroy {
this.sonarrService.getQualityProfiles(this.settings)
.takeUntil(this.subscriptions)
.subscribe(x => {
this.qualities = x;
this.qualities = x;
this.profilesRunning = false;
this.notificationService.success("Quality Profiles", "Successfully retrevied the Quality Profiles");
});
this.profilesRunning = false;
this.notificationService.success("Quality Profiles", "Successfully retrevied the Quality Profiles");
});
}
getRootFolders() {
@ -55,11 +55,11 @@ export class SonarrComponent implements OnInit, OnDestroy {
this.sonarrService.getRootFolders(this.settings)
.takeUntil(this.subscriptions)
.subscribe(x => {
this.rootFolders = x;
this.rootFolders = x;
this.rootFoldersRunning = false;
this.notificationService.success("Settings Saved", "Successfully retrevied the Root Folders");
});
this.rootFoldersRunning = false;
this.notificationService.success("Settings Saved", "Successfully retrevied the Root Folders");
});
}
test() {
@ -67,15 +67,24 @@ export class SonarrComponent implements OnInit, OnDestroy {
}
save() {
if (!this.qualities || !this.rootFolders) {
this.notificationService.error("Settings Saved", "Please make sure we have selected a quality profile");
}
if (!this.rootFolders) {
this.notificationService.error("Settings Saved", "Please make sure we have a root folder");
}
this.settingsService.saveSonarr(this.settings)
.takeUntil(this.subscriptions)
.subscribe(x => {
if (x) {
this.notificationService.success("Settings Saved", "Successfully saved Sonarr settings");
} else {
this.notificationService.success("Settings Saved", "There was an error when saving the Sonarr settings");
}
});
if (x) {
this.notificationService.success("Settings Saved", "Successfully saved Sonarr settings");
} else {
this.notificationService.error("Settings Saved", "There was an error when saving the Sonarr settings");
}
});
}
ngOnDestroy(): void {

2
src/Ombi/ClientApp/app/wizard/emby/emby.component.html
Unescape View File

@ -1,6 +1,6 @@

<h4 class="media-heading landing-title">Emby Authentication</h4>
<div class="form-group">
<div class="form-group" *ngIf="embySettings">
<label for="Ip" class="control-label">Emby Hostname or IP Address</label>
<div>
<input type="text" [(ngModel)]="embySettings.ip" class="form-control form-control-custom " id="Ip" name="Ip" placeholder="192.168.1.1">

12
src/Ombi/ClientApp/app/wizard/emby/emby.component.ts
Unescape View File

@ -15,18 +15,6 @@ export class EmbyComponent {
constructor(private embyService: EmbyService,
private router: Router,
private notificationService: NotificationService) {
this.embySettings = {
administratorId: "",
apiKey: "",
enable: true,
enableEpisodeSearching: true,
id: 0,
ip: "",
port: 8096,
ssl: false,
subDir: "",
}
}
private embySettings: IEmbySettings;

Write Preview
Loading…
Cancel
Save