github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-05 20:51:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/Ombi-app/Ombi into develop

Browse source
This commit is contained in:
Jamie Rees 2024-09-09 09:28:38 +01:00
commit 3b1395e6f5
6 changed files with 78 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

41
CHANGELOG.md
View file

@ -1,3 +1,21 @@
## [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)
### 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)
@ -3708,26 +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))
## [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))

15
src/Ombi.Store/Entities/Requests/MovieRequests.cs
View file

@ -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
View file

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

7
src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts
View file

@ -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;

39
src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.ts
View file

@ -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,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.profiles = c;
this.setQualityOverrides();
});
this.radarrService.getRootFolders4kFromSettings().subscribe(c => {
this.radarrRootFolders = 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
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 {

2
version.json
View file

@ -1,3 +1,3 @@
{
"version": "4.46.1"
"version": "4.46.3"
}