fix(radarr-4k): 🐛 Fixed an issue where the overrides wouldn't work for 4k Requests

restructure
TidusJar 5 months ago
parent 938a0b74aa
commit 0fb29a0b16

@ -44,6 +44,21 @@ namespace Ombi.Store.Entities.Requests
public DateTime MarkedAsDenied4K { get; set; } public DateTime MarkedAsDenied4K { get; set; }
public string DeniedReason4K { get; set; } public string DeniedReason4K { get; set; }
[NotMapped]
public RequestCombination RequestCombination
{
get
{
if (Has4KRequest && RequestedDate != default)
{
return RequestCombination.Both;
}
if (Has4KRequest) { return RequestCombination.FourK; }
return RequestCombination.Normal;
}
}
/// <summary> /// <summary>
/// Only Use for setting the Language Code, Use the LanguageCode property for reading /// Only Use for setting the Language Code, Use the LanguageCode property for reading

@ -0,0 +1,9 @@
namespace Ombi.Store.Entities.Requests
{
public enum RequestCombination
{
Normal,
FourK,
Both
}
}

@ -25,12 +25,19 @@ export interface IMovieRequests extends IFullBaseRequest {
requestedDate: Date; requestedDate: Date;
watchedByRequestedUser: boolean; watchedByRequestedUser: boolean;
playedByUsersCount: number; playedByUsersCount: number;
requestCombination: RequestCombination;
// For the UI // For the UI
rootPathOverrideTitle: string; rootPathOverrideTitle: string;
qualityOverrideTitle: string; qualityOverrideTitle: string;
} }
export enum RequestCombination {
Normal,
FourK,
Both
}
export interface IMovieAdvancedOptions { export interface IMovieAdvancedOptions {
requestId: number; requestId: number;
qualityOverride: number; qualityOverride: number;

@ -1,6 +1,6 @@
import { Component, Inject, OnInit } from "@angular/core"; import { Component, Inject, OnInit } from "@angular/core";
import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog"; import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog";
import { IAdvancedData, IRadarrProfile, IRadarrRootFolder } from "../../../../../interfaces"; import { IAdvancedData, IRadarrProfile, IRadarrRootFolder, RequestCombination } from "../../../../../interfaces";
import { RadarrService } from "../../../../../services"; import { RadarrService } from "../../../../../services";
@Component({ @Component({
@ -11,6 +11,8 @@ export class MovieAdvancedOptionsComponent implements OnInit {
public radarrProfiles: IRadarrProfile[]; public radarrProfiles: IRadarrProfile[];
public radarrRootFolders: IRadarrRootFolder[]; public radarrRootFolders: IRadarrRootFolder[];
public show4k: boolean = false;
public showNormal: boolean = false;
constructor(public dialogRef: MatDialogRef<MovieAdvancedOptionsComponent>, @Inject(MAT_DIALOG_DATA) public data: IAdvancedData, constructor(public dialogRef: MatDialogRef<MovieAdvancedOptionsComponent>, @Inject(MAT_DIALOG_DATA) public data: IAdvancedData,
private radarrService: RadarrService private radarrService: RadarrService
@ -19,6 +21,20 @@ export class MovieAdvancedOptionsComponent implements OnInit {
public async ngOnInit() { public async ngOnInit() {
this.show4k = this.data.movieRequest.requestCombination === RequestCombination.FourK || this.data.movieRequest.requestCombination === RequestCombination.Both;
this.showNormal = this.data.movieRequest.requestCombination === RequestCombination.Normal || this.data.movieRequest.requestCombination === RequestCombination.Both;
if (this.show4k) {
this.radarrService.getQualityProfiles4kFromSettings().subscribe(c => {
this.radarrProfiles = c;
this.data.profiles4k = c;
this.setQualityOverrides();
});
this.radarrService.getRootFolders4kFromSettings().subscribe(c => {
this.radarrRootFolders = c;
this.data.rootFolders4k = c;
this.setRootFolderOverrides();
});
} else { // Currently show either 4k or normal, if it's a dual request there needs to be more work done to save the overrides for 4k separately
this.radarrService.getQualityProfilesFromSettings().subscribe(c => { this.radarrService.getQualityProfilesFromSettings().subscribe(c => {
this.radarrProfiles = c; this.radarrProfiles = c;
this.data.profiles = c; this.data.profiles = c;
@ -30,6 +46,7 @@ export class MovieAdvancedOptionsComponent implements OnInit {
this.setRootFolderOverrides(); this.setRootFolderOverrides();
}); });
} }
}
private setQualityOverrides(): void { private setQualityOverrides(): void {
if (this.radarrProfiles) { if (this.radarrProfiles) {

Loading…
Cancel
Save