From 938a0b74aa2e2faf2784bf9f412ac173d0aebcbb Mon Sep 17 00:00:00 2001 From: Conventional Changelog Action Date: Tue, 3 Sep 2024 15:30:07 +0000 Subject: [PATCH 1/4] chore(release): :rocket: v4.46.2 [skip ci] --- CHANGELOG.md | 18 +++++++++--------- version.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18c186027..7f654c979 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [4.46.2](https://github.com/Ombi-app/Ombi/compare/v4.46.1...v4.46.2) (2024-09-03) + + +### Bug Fixes + +* **radarr:** :bug: Enable validation on the radarr settings page ([0af3511](https://github.com/Ombi-app/Ombi/commit/0af3511e819d24e0f4edf6f33931e61bba743224)) + + + ## [4.46.1](https://github.com/Ombi-app/Ombi/compare/v4.46.0...v4.46.1) (2024-08-27) @@ -3722,12 +3731,3 @@ -## [4.37.3](https://github.com/Ombi-app/Ombi/compare/v4.37.2...v4.37.3) (2023-05-07) - - -### Bug Fixes - -* Show the ApiAlias in the requests-list ([9ff624c](https://github.com/Ombi-app/Ombi/commit/9ff624ce4646815b239fbb8327117947f0a90e4b)) - - - diff --git a/version.json b/version.json index 25b499055..6f6420394 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "4.46.1" + "version": "4.46.2" } From 0fb29a0b16b1fc87f71df1a589f6141324cf2f1b Mon Sep 17 00:00:00 2001 From: TidusJar Date: Sat, 7 Sep 2024 21:04:24 +0100 Subject: [PATCH 2/4] fix(radarr-4k): :bug: Fixed an issue where the overrides wouldn't work for 4k Requests --- .../Entities/Requests/MovieRequests.cs | 15 +++++++ .../Entities/Requests/RequestCombination.cs | 9 +++++ .../src/app/interfaces/IRequestModel.ts | 7 ++++ .../movie-advanced-options.component.ts | 39 +++++++++++++------ 4 files changed, 59 insertions(+), 11 deletions(-) create mode 100644 src/Ombi.Store/Entities/Requests/RequestCombination.cs diff --git a/src/Ombi.Store/Entities/Requests/MovieRequests.cs b/src/Ombi.Store/Entities/Requests/MovieRequests.cs index 3c3c75893..dbcb63c69 100644 --- a/src/Ombi.Store/Entities/Requests/MovieRequests.cs +++ b/src/Ombi.Store/Entities/Requests/MovieRequests.cs @@ -44,6 +44,21 @@ public MovieRequests() 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; + } + } + /// /// Only Use for setting the Language Code, Use the LanguageCode property for reading diff --git a/src/Ombi.Store/Entities/Requests/RequestCombination.cs b/src/Ombi.Store/Entities/Requests/RequestCombination.cs new file mode 100644 index 000000000..048d35c19 --- /dev/null +++ b/src/Ombi.Store/Entities/Requests/RequestCombination.cs @@ -0,0 +1,9 @@ +namespace Ombi.Store.Entities.Requests +{ + public enum RequestCombination + { + Normal, + FourK, + Both + } +} diff --git a/src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts b/src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts index 7270e125b..033b1c02a 100644 --- a/src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts +++ b/src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts @@ -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; diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.ts index d164644ff..097034bb7 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.ts +++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.ts @@ -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, @Inject(MAT_DIALOG_DATA) public data: IAdvancedData, private radarrService: RadarrService @@ -19,16 +21,31 @@ export class MovieAdvancedOptionsComponent implements OnInit { public async ngOnInit() { - this.radarrService.getQualityProfilesFromSettings().subscribe(c => { - this.radarrProfiles = c; - this.data.profiles = c; - this.setQualityOverrides(); - }); - this.radarrService.getRootFoldersFromSettings().subscribe(c => { - this.radarrRootFolders = c; - this.data.rootFolders = c; - this.setRootFolderOverrides(); - }); + 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; + this.setQualityOverrides(); + }); + this.radarrService.getRootFoldersFromSettings().subscribe(c => { + this.radarrRootFolders = c; + this.data.rootFolders = c; + this.setRootFolderOverrides(); + }); + } } private setQualityOverrides(): void { From 4eef0e6e218184891ce3b8b299e1c7bd166417d6 Mon Sep 17 00:00:00 2001 From: TidusJar Date: Sat, 7 Sep 2024 21:05:15 +0100 Subject: [PATCH 3/4] bug: fixed compile errors --- .../movie-advanced-options.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.ts index 097034bb7..7b02a8535 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.ts +++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.ts @@ -26,12 +26,12 @@ export class MovieAdvancedOptionsComponent implements OnInit { if (this.show4k) { this.radarrService.getQualityProfiles4kFromSettings().subscribe(c => { this.radarrProfiles = c; - this.data.profiles4k = c; + this.data.profiles = c; this.setQualityOverrides(); }); this.radarrService.getRootFolders4kFromSettings().subscribe(c => { this.radarrRootFolders = c; - this.data.rootFolders4k = c; + this.data.rootFolders = 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 From b24f6084e068960fe3d16448ba87906c6cc380d3 Mon Sep 17 00:00:00 2001 From: Conventional Changelog Action Date: Sat, 7 Sep 2024 20:06:48 +0000 Subject: [PATCH 4/4] chore(release): :rocket: v4.46.3 [skip ci] --- CHANGELOG.md | 23 +++++++++-------------- version.json | 2 +- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f654c979..3c72ff1f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [4.46.3](https://github.com/Ombi-app/Ombi/compare/v4.46.2...v4.46.3) (2024-09-07) + + +### Bug Fixes + +* **radarr-4k:** :bug: Fixed an issue where the overrides wouldn't work for 4k Requests ([0fb29a0](https://github.com/Ombi-app/Ombi/commit/0fb29a0b16b1fc87f71df1a589f6141324cf2f1b)) + + + ## [4.46.2](https://github.com/Ombi-app/Ombi/compare/v4.46.1...v4.46.2) (2024-09-03) @@ -3717,17 +3726,3 @@ -# [4.38.0](https://github.com/Ombi-app/Ombi/compare/v4.37.3...v4.38.0) (2023-05-07) - - -### Bug Fixes - -* remove sort header ([969bc7b](https://github.com/Ombi-app/Ombi/commit/969bc7bb25ea900ab9199509b079b36843e5bd6f)) - - -### Features - -* **emby:** Show watched status for Movie requests ([9cfb10b](https://github.com/Ombi-app/Ombi/commit/9cfb10bb1ee69067a6f47bd2c8a72d4e6834350e)) - - - diff --git a/version.json b/version.json index 6f6420394..f46085929 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "4.46.2" + "version": "4.46.3" }