mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-07-06 13:11:13 -07:00
fix(radarr-4k): 🐛 Fixed an issue where the overrides wouldn't work for 4k Requests
This commit is contained in:
parent
938a0b74aa
commit
0fb29a0b16
4 changed files with 59 additions and 11 deletions
|
@ -44,6 +44,21 @@ namespace Ombi.Store.Entities.Requests
|
|||
public DateTime MarkedAsDenied4K { 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>
|
||||
/// Only Use for setting the Language Code, Use the LanguageCode property for reading
|
||||
|
|
9
src/Ombi.Store/Entities/Requests/RequestCombination.cs
Normal file
9
src/Ombi.Store/Entities/Requests/RequestCombination.cs
Normal file
|
@ -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;
|
||||
watchedByRequestedUser: boolean;
|
||||
playedByUsersCount: number;
|
||||
requestCombination: RequestCombination;
|
||||
|
||||
// For the UI
|
||||
rootPathOverrideTitle: string;
|
||||
qualityOverrideTitle: string;
|
||||
}
|
||||
|
||||
export enum RequestCombination {
|
||||
Normal,
|
||||
FourK,
|
||||
Both
|
||||
}
|
||||
|
||||
export interface IMovieAdvancedOptions {
|
||||
requestId: number;
|
||||
qualityOverride: number;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { Component, Inject, OnInit } from "@angular/core";
|
||||
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";
|
||||
|
||||
@Component({
|
||||
|
@ -11,6 +11,8 @@ export class MovieAdvancedOptionsComponent implements OnInit {
|
|||
|
||||
public radarrProfiles: IRadarrProfile[];
|
||||
public radarrRootFolders: IRadarrRootFolder[];
|
||||
public show4k: boolean = false;
|
||||
public showNormal: boolean = false;
|
||||
|
||||
constructor(public dialogRef: MatDialogRef<MovieAdvancedOptionsComponent>, @Inject(MAT_DIALOG_DATA) public data: IAdvancedData,
|
||||
private radarrService: RadarrService
|
||||
|
@ -19,6 +21,20 @@ export class MovieAdvancedOptionsComponent implements OnInit {
|
|||
|
||||
|
||||
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.radarrProfiles = c;
|
||||
this.data.profiles = c;
|
||||
|
@ -30,6 +46,7 @@ export class MovieAdvancedOptionsComponent implements OnInit {
|
|||
this.setRootFolderOverrides();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private setQualityOverrides(): void {
|
||||
if (this.radarrProfiles) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue