mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-07-15 17:52:57 -07:00
Fixed the issue where we could sometimes allow the request of a whole series when the user shouldn't be able to
This commit is contained in:
parent
527bc00c09
commit
417e4085c5
4 changed files with 91 additions and 4 deletions
|
@ -116,6 +116,7 @@ namespace Ombi.Core.Engine
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove the ID since this is a new child
|
// Remove the ID since this is a new child
|
||||||
|
// This was a TVDBID for the request rules to run
|
||||||
tvBuilder.ChildRequest.Id = 0;
|
tvBuilder.ChildRequest.Id = 0;
|
||||||
if (!tvBuilder.ChildRequest.SeasonRequests.Any())
|
if (!tvBuilder.ChildRequest.SeasonRequests.Any())
|
||||||
{
|
{
|
||||||
|
|
|
@ -41,7 +41,7 @@ namespace Ombi.Core.Helpers
|
||||||
ShowInfo = await TvApi.ShowLookupByTheTvDbId(id);
|
ShowInfo = await TvApi.ShowLookupByTheTvDbId(id);
|
||||||
Results = await MovieDbApi.SearchTv(ShowInfo.name);
|
Results = await MovieDbApi.SearchTv(ShowInfo.name);
|
||||||
foreach (TvSearchResult result in Results) {
|
foreach (TvSearchResult result in Results) {
|
||||||
if (result.Name == ShowInfo.name)
|
if (result.Name.Equals(ShowInfo.name, StringComparison.InvariantCultureIgnoreCase))
|
||||||
{
|
{
|
||||||
var showIds = await MovieDbApi.GetTvExternals(result.Id);
|
var showIds = await MovieDbApi.GetTvExternals(result.Id);
|
||||||
ShowInfo.externals.imdb = showIds.imdb_id;
|
ShowInfo.externals.imdb = showIds.imdb_id;
|
||||||
|
@ -64,14 +64,15 @@ namespace Ombi.Core.Helpers
|
||||||
{
|
{
|
||||||
ChildRequest = new ChildRequests
|
ChildRequest = new ChildRequests
|
||||||
{
|
{
|
||||||
Id = model.TvDbId,
|
Id = model.TvDbId, // This is set to 0 after the request rules have run, the request rules needs it to identify the request
|
||||||
RequestType = RequestType.TvShow,
|
RequestType = RequestType.TvShow,
|
||||||
RequestedDate = DateTime.UtcNow,
|
RequestedDate = DateTime.UtcNow,
|
||||||
Approved = false,
|
Approved = false,
|
||||||
RequestedUserId = userId,
|
RequestedUserId = userId,
|
||||||
SeasonRequests = new List<SeasonRequests>(),
|
SeasonRequests = new List<SeasonRequests>(),
|
||||||
Title = ShowInfo.name,
|
Title = ShowInfo.name,
|
||||||
SeriesType = ShowInfo.genres.Any( s => s.Equals("Anime", StringComparison.OrdinalIgnoreCase)) ? SeriesType.Anime : SeriesType.Standard
|
ReleaseYear = FirstAir,
|
||||||
|
SeriesType = ShowInfo.genres.Any( s => s.Equals("Anime", StringComparison.InvariantCultureIgnoreCase)) ? SeriesType.Anime : SeriesType.Standard
|
||||||
};
|
};
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
|
|
82
src/Ombi.Core/Rule/Rules/Request/ExistingPlexRequestRule.cs
Normal file
82
src/Ombi.Core/Rule/Rules/Request/ExistingPlexRequestRule.cs
Normal file
|
@ -0,0 +1,82 @@
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Ombi.Core.Rule.Interfaces;
|
||||||
|
using Ombi.Store.Entities;
|
||||||
|
using Ombi.Store.Entities.Requests;
|
||||||
|
using Ombi.Store.Repository;
|
||||||
|
|
||||||
|
namespace Ombi.Core.Rule.Rules.Request
|
||||||
|
{
|
||||||
|
public class ExistingPlexRequestRule : BaseRequestRule, IRules<BaseRequest>
|
||||||
|
{
|
||||||
|
public ExistingPlexRequestRule(IPlexContentRepository rv)
|
||||||
|
{
|
||||||
|
_plexContent = rv;
|
||||||
|
}
|
||||||
|
|
||||||
|
private readonly IPlexContentRepository _plexContent;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// We check if the request exists, if it does then we don't want to re-request it.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="obj">The object.</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public async Task<RuleResult> Execute(BaseRequest obj)
|
||||||
|
{
|
||||||
|
if (obj.RequestType == RequestType.TvShow)
|
||||||
|
{
|
||||||
|
var tvRequest = (ChildRequests) obj;
|
||||||
|
|
||||||
|
var tvContent = _plexContent.GetAll().Where(x => x.Type == PlexMediaTypeEntity.Show);
|
||||||
|
// We need to do a check on the TVDBId
|
||||||
|
var anyTvDbMatches = await tvContent.Include(x => x.Episodes).FirstOrDefaultAsync(x => x.HasTvDb && x.TvDbId.Equals(tvRequest.Id.ToString())); // the Id on the child is the tvdbid at this point
|
||||||
|
if (anyTvDbMatches == null)
|
||||||
|
{
|
||||||
|
// So we do not have a TVDB Id, that really sucks.
|
||||||
|
// Let's try and match on the title and year of the show
|
||||||
|
var titleAndYearMatch = await tvContent.Include(x=> x.Episodes).FirstOrDefaultAsync(x =>
|
||||||
|
x.Title.Equals(tvRequest.Title, StringComparison.InvariantCultureIgnoreCase)
|
||||||
|
&& x.ReleaseYear == tvRequest.ReleaseYear.Year.ToString());
|
||||||
|
if (titleAndYearMatch != null)
|
||||||
|
{
|
||||||
|
// We have a match! Suprise Motherfucker
|
||||||
|
return CheckExistingContent(tvRequest, titleAndYearMatch);
|
||||||
|
}
|
||||||
|
|
||||||
|
// We do not have this
|
||||||
|
return Success();
|
||||||
|
}
|
||||||
|
// looks like we have a match on the TVDbID
|
||||||
|
return CheckExistingContent(tvRequest, anyTvDbMatches);
|
||||||
|
}
|
||||||
|
return Success();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private RuleResult CheckExistingContent(ChildRequests child, PlexServerContent content)
|
||||||
|
{
|
||||||
|
foreach (var season in child.SeasonRequests)
|
||||||
|
{
|
||||||
|
var currentSeasonRequest =
|
||||||
|
content.Episodes.Where(x => x.SeasonNumber == season.SeasonNumber).ToList();
|
||||||
|
if (!currentSeasonRequest.Any())
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
foreach (var e in season.Episodes)
|
||||||
|
{
|
||||||
|
var hasEpisode = currentSeasonRequest.Any(x => x.EpisodeNumber == e.EpisodeNumber);
|
||||||
|
if (hasEpisode)
|
||||||
|
{
|
||||||
|
return Fail($"We already have episodes requested from series {child.Title}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return Success();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,4 +1,5 @@
|
||||||
using System.Collections.Generic;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.ComponentModel.DataAnnotations.Schema;
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
using Ombi.Store.Repository.Requests;
|
using Ombi.Store.Repository.Requests;
|
||||||
|
|
||||||
|
@ -22,6 +23,8 @@ namespace Ombi.Store.Entities.Requests
|
||||||
[NotMapped]
|
[NotMapped]
|
||||||
public bool ShowSubscribe { get; set; }
|
public bool ShowSubscribe { get; set; }
|
||||||
|
|
||||||
|
[NotMapped]
|
||||||
|
public DateTime ReleaseYear { get; set; } // Used in the ExistingPlexRequestRule.cs
|
||||||
|
|
||||||
[ForeignKey(nameof(IssueId))]
|
[ForeignKey(nameof(IssueId))]
|
||||||
public List<Issues> Issues { get; set; }
|
public List<Issues> Issues { get; set; }
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue