@ -566,34 +566,6 @@ namespace PlexRequests.UI.Modules
return Response . AsJson ( new JsonResponseModel { Result = false , Message = "Our TV Provider (TVMaze) doesn't have a TheTVDBId for this item. Please report this to TVMaze. We cannot add the series sorry." } ) ;
return Response . AsJson ( new JsonResponseModel { Result = false , Message = "Our TV Provider (TVMaze) doesn't have a TheTVDBId for this item. Please report this to TVMaze. We cannot add the series sorry." } ) ;
}
}
// check if the show/episodes have already been requested
var existingRequest = await RequestService . CheckRequestAsync ( showId ) ;
var difference = new List < EpisodesModel > ( ) ;
if ( existingRequest ! = null )
{
if ( episodeRequest )
{
difference = GetListDifferences ( existingRequest . Episodes , episodeModel . Episodes ) . ToList ( ) ;
if ( difference . Any ( ) )
{
existingRequest . Episodes = episodeModel . Episodes
. Select ( r = >
new EpisodesModel
{
SeasonNumber = r . SeasonNumber ,
EpisodeNumber = r . EpisodeNumber
} ) . ToList ( ) ;
return await AddUserToRequest ( existingRequest , settings , fullShowName ) ;
}
// We have an episode that has not yet been requested, let's continue
}
else
{
return await AddUserToRequest ( existingRequest , settings , fullShowName ) ;
}
}
var model = new RequestedModel
var model = new RequestedModel
{
{
ProviderId = showInfo . externals ? . thetvdb ? ? 0 ,
ProviderId = showInfo . externals ? . thetvdb ? ? 0 ,
@ -652,6 +624,45 @@ namespace PlexRequests.UI.Modules
model . SeasonList = seasonsList . ToArray ( ) ;
model . SeasonList = seasonsList . ToArray ( ) ;
// check if the show/episodes have already been requested
var existingRequest = await RequestService . CheckRequestAsync ( showId ) ;
var difference = new List < EpisodesModel > ( ) ;
if ( existingRequest ! = null )
{
if ( episodeRequest )
{
// Make sure we are not somehow adding dupes
difference = GetListDifferences ( existingRequest . Episodes , episodeModel . Episodes ) . ToList ( ) ;
if ( difference . Any ( ) )
{
// Convert the request into the correct shape
var newEpisodes = episodeModel . Episodes ? . Select ( x = > new EpisodesModel
{
SeasonNumber = x . SeasonNumber ,
EpisodeNumber = x . EpisodeNumber
} ) ;
// Add it to the existing requests
existingRequest . Episodes . AddRange ( newEpisodes ? ? Enumerable . Empty < EpisodesModel > ( ) ) ;
// It's technically a new request now, so set the status to not approved.
existingRequest . Approved = false ;
return await AddUserToRequest ( existingRequest , settings , fullShowName ) ;
}
// We have an episode that has not yet been requested, let's continue
}
else if ( model . SeasonList . Except ( existingRequest . SeasonList ) . Any ( ) )
{
// This is a season being requested that we do not yet have
// Let's just continue
}
else
{
return await AddUserToRequest ( existingRequest , settings , fullShowName ) ;
}
}
try
try
{
{
var shows = Checker . GetPlexTvShows ( ) ;
var shows = Checker . GetPlexTvShows ( ) ;
@ -673,11 +684,7 @@ namespace PlexRequests.UI.Modules
}
}
}
}
var episodes = await GetEpisodes ( showId ) ;
var diff = await GetEpisodeRequestDifference ( showId , model ) ;
var availableEpisodes = episodes . Where ( x = > x . Requested ) . ToList ( ) ;
var availble = availableEpisodes . Select ( a = > new EpisodesModel { EpisodeNumber = a . EpisodeNumber , SeasonNumber = a . SeasonNumber } ) . ToList ( ) ;
var diff = model . Episodes . Except ( availble ) ;
model . Episodes = diff . ToList ( ) ;
model . Episodes = diff . ToList ( ) ;
}
}
else
else
@ -704,6 +711,11 @@ namespace PlexRequests.UI.Modules
var result = await sender . SendToSonarr ( s , model ) ;
var result = await sender . SendToSonarr ( s , model ) ;
if ( ! string . IsNullOrEmpty ( result ? . title ) )
if ( ! string . IsNullOrEmpty ( result ? . title ) )
{
{
if ( existingRequest ! = null )
{
return await UpdateRequest ( model , settings ,
$"{fullShowName} {Resources.UI.Search_SuccessfullyAdded}" ) ;
}
return await AddRequest ( model , settings , $"{fullShowName} {Resources.UI.Search_SuccessfullyAdded}" ) ;
return await AddRequest ( model , settings , $"{fullShowName} {Resources.UI.Search_SuccessfullyAdded}" ) ;
}
}
Log . Debug ( "Error with sending to sonarr." ) ;
Log . Debug ( "Error with sending to sonarr." ) ;
@ -735,21 +747,14 @@ namespace PlexRequests.UI.Modules
private async Task < Response > AddUserToRequest ( RequestedModel existingRequest , PlexRequestSettings settings , string fullShowName )
private async Task < Response > AddUserToRequest ( RequestedModel existingRequest , PlexRequestSettings settings , string fullShowName )
{
{
// check if the current user is already marked as a requester for this show, if not, add them
// check if the current user is already marked as a requester for this show, if not, add them
if ( ! existingRequest . UserHasRequested ( Username ) | | existingRequest . Episodes . Any ( ) )
if ( ! existingRequest . UserHasRequested ( Username ) )
{
{
existingRequest . RequestedUsers . Add ( Username ) ;
existingRequest . RequestedUsers . Add ( Username ) ;
await RequestService . UpdateRequestAsync ( existingRequest ) ;
}
}
return
Response . AsJson (
return await UpdateRequest ( existingRequest , settings , settings . UsersCanViewOnlyOwnRequests
new JsonResponseModel
? $"{fullShowName} {Resources.UI.Search_SuccessfullyAdded}"
{
: $"{fullShowName} {Resources.UI.Search_AlreadyRequested}" ) ;
Result = true ,
Message =
settings . UsersCanViewOnlyOwnRequests
? $"{fullShowName} {Resources.UI.Search_SuccessfullyAdded}"
: $"{fullShowName} {Resources.UI.Search_AlreadyRequested}"
} ) ;
}
}
private bool ShouldSendNotification ( RequestType type , PlexRequestSettings prSettings )
private bool ShouldSendNotification ( RequestType type , PlexRequestSettings prSettings )
@ -1103,6 +1108,44 @@ namespace PlexRequests.UI.Modules
return Response . AsJson ( new JsonResponseModel { Result = true , Message = message } ) ;
return Response . AsJson ( new JsonResponseModel { Result = true , Message = message } ) ;
}
}
private async Task < Response > UpdateRequest ( RequestedModel model , PlexRequestSettings settings , string message )
{
await RequestService . UpdateRequestAsync ( model ) ;
if ( ShouldSendNotification ( model . Type , settings ) )
{
var notificationModel = new NotificationModel
{
Title = model . Title ,
User = Username ,
DateTime = DateTime . Now ,
NotificationType = NotificationType . NewRequest ,
RequestType = model . Type
} ;
await NotificationService . Publish ( notificationModel ) ;
}
var limit = await RequestLimitRepo . GetAllAsync ( ) ;
var usersLimit = limit . FirstOrDefault ( x = > x . Username = = Username & & x . RequestType = = model . Type ) ;
if ( usersLimit = = null )
{
await RequestLimitRepo . InsertAsync ( new RequestLimit
{
Username = Username ,
RequestType = model . Type ,
FirstRequestDate = DateTime . UtcNow ,
RequestCount = 1
} ) ;
}
else
{
usersLimit . RequestCount + + ;
await RequestLimitRepo . UpdateAsync ( usersLimit ) ;
}
return Response . AsJson ( new JsonResponseModel { Result = true , Message = message } ) ;
}
private IEnumerable < Store . EpisodesModel > GetListDifferences ( IEnumerable < EpisodesModel > existing , IEnumerable < Models . EpisodesModel > request )
private IEnumerable < Store . EpisodesModel > GetListDifferences ( IEnumerable < EpisodesModel > existing , IEnumerable < Models . EpisodesModel > request )
{
{
var newRequest = request
var newRequest = request
@ -1115,5 +1158,15 @@ namespace PlexRequests.UI.Modules
return newRequest . Except ( existing ) ;
return newRequest . Except ( existing ) ;
}
}
private async Task < IEnumerable < EpisodesModel > > GetEpisodeRequestDifference ( int showId , RequestedModel model )
{
var episodes = await GetEpisodes ( showId ) ;
var availableEpisodes = episodes . Where ( x = > x . Requested ) . ToList ( ) ;
var available = availableEpisodes . Select ( a = > new EpisodesModel { EpisodeNumber = a . EpisodeNumber , SeasonNumber = a . SeasonNumber } ) . ToList ( ) ;
var diff = model . Episodes . Except ( available ) ;
return diff ;
}
}
}
} }
tidusjar
8 years ago