github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-16 02:02:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enhance display of denied TV shows

Browse source
This commit is contained in:
sephrat 2022-04-07 18:43:13 +02:00
parent d933196cf0
commit 0523c9a3f1
7 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
View file

@ -308,6 +308,9 @@ namespace Ombi.Core.Engine.V2
item.PartlyAvailable = oldModel.PartlyAvailable;
item.Requested = oldModel.Requested;
item.Available = oldModel.Available;
item.Denied = oldModel.Denied;
item.DeniedReason = oldModel.DeniedReason;
item.FullyDenied = oldModel.FullyDenied;
item.Approved = oldModel.Approved;
item.SeasonRequests = oldModel.SeasonRequests;
item.RequestId = oldModel.RequestId;

1
src/Ombi.Core/Models/Search/SearchTvShowViewModel.cs
View file

@ -56,6 +56,7 @@ namespace Ombi.Core.Models.Search
public bool FullyAvailable { get; set; }
// We only have some episodes
public bool PartlyAvailable { get; set; }
public bool FullyDenied { get; set; }
public override RequestType Type => RequestType.TvShow;
public string BackdropPath { get; set; }

1
src/Ombi.Core/Models/Search/V2/SearchFullInfoTvShowViewModel.cs
View file

@ -48,6 +48,7 @@ namespace Ombi.Core.Models.Search.V2
public bool FullyAvailable { get; set; }
// We only have some episodes
public bool PartlyAvailable { get; set; }
public bool FullyDenied { get; set; }
public override RequestType Type => RequestType.TvShow;
}

6
src/Ombi.Core/Rule/Rules/Search/ExistingRule.cs
View file

@ -62,6 +62,7 @@ namespace Ombi.Core.Rule.Rules.Search
request.Requested = true;
request.Approved = tvRequests.ChildRequests.Any(x => x.Approved);
request.Denied = tvRequests.ChildRequests.Any(x => x.Denied ?? false);
request.DeniedReason = tvRequests.ChildRequests.FirstOrDefault(x => x.Denied == true).DeniedReason;
// Let's modify the seasonsrequested to reflect what we have requested...
foreach (var season in request.SeasonRequests)
@ -100,6 +101,11 @@ namespace Ombi.Core.Rule.Rules.Search
request.PartlyAvailable = true;
}
if (request.SeasonRequests.Any() && request.SeasonRequests.All(x => x.Episodes.All(e => e.Denied ?? false)))
{
request.FullyDenied = true;
}
var hasUnairedRequests = request.SeasonRequests.Any() && request.SeasonRequests.All(x => x.Episodes.Any(e => e.AirDate >= DateTime.UtcNow));
if (request.FullyAvailable)

1
src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts
View file

@ -206,6 +206,7 @@ export class DiscoverCardComponent implements OnInit {
this.result.overview = updated.overview;
this.result.approved = updated.approved;
this.result.available = updated.fullyAvailable;
this.result.denied = updated.fullyDenied;
this.fullyLoaded = true;
}

3
src/Ombi/ClientApp/src/app/interfaces/ISearchTvResultV2.ts
View file

@ -25,6 +25,9 @@ export interface ISearchTvResultV2 {
seasonRequests: INewSeasonRequests[];
requestAll: boolean;
approved: boolean;
denied: boolean;
deniedReason: string;
fullyDenied: boolean;
requested: boolean;
available: boolean;
plexUrl: string;

6
src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html
View file

@ -65,7 +65,7 @@
(click)="request()"><i class="fas fa-plus"></i>
{{ 'Common.Request' | translate }}</button>
<button *ngIf="allEpisodesRequested()" mat-raised-button class="btn-spacing" color="warn" [disabled]>
<button *ngIf="!tv.fullyDenied && allEpisodesRequested()" mat-raised-button class="btn-spacing" color="warn" [disabled]>
<i class="fas fa-check"></i>
{{ 'Common.Requested' | translate }}</button>
@ -82,6 +82,10 @@
class="btn-spacing" color="accent" [disabled]>
<i class="fas fa-check"></i> {{'Common.PartiallyAvailable' | translate }}</button>
<!-- end unaired episodes-->
<button id="deniedButton" *ngIf="tv.fullyDenied" [matTooltip]="tv.deniedReason" mat-raised-button class="btn-spacing" color="warn">
<i class="fas fa-times"></i> {{'Common.Denied' | translate }}
</button>
<button mat-raised-button class="btn-spacing" color="danger" id="reportIssueBtn" *ngIf="issuesEnabled" (click)="issue()">
<i class="fas fa-exclamation"></i> {{