diff --git a/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.html b/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.html index 81ecb21dd..c6d801a93 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.html +++ b/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.html @@ -1,43 +1,55 @@
-
-

{{'Discovery.Genres' | translate}}

- -
-
-

{{'Discovery.RecentlyRequestedTab' | translate}}

-
- -
-
+
+ @defer { +

{{ 'Discovery.Genres' | translate }}

+ + } +
+ @defer { +
+

{{ 'Discovery.RecentlyRequestedTab' | translate }}

+
+ +
+
+ } -
-

{{'Discovery.SeasonalTab' | translate}}

-
- -
-
+
+

{{ 'Discovery.SeasonalTab' | translate }}

+
+ +
+
-
-

{{'Discovery.PopularTab' | translate}}

-
- -
+
+

{{ 'Discovery.PopularTab' | translate }}

+
+ @defer { + + } +
+
-
+
+

{{ 'Discovery.TrendingTab' | translate }}

+
+ @defer { + + } +
+
-
-

{{'Discovery.TrendingTab' | translate}}

-
- -
- -
- -
-

{{'Discovery.UpcomingTab' | translate}}

-
- -
-
- -
\ No newline at end of file +
+

{{ 'Discovery.UpcomingTab' | translate }}

+
+ @defer { + + } +
+
+ diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html index c1aeb067d..750ccc30d 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html +++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html @@ -1,300 +1,417 @@
+ +
+ + +
+
+
+
+
+ +
- - +
+
+
+
+ diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts index 5d5de3ee4..0cd671736 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts +++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts @@ -1,336 +1,376 @@ -import { Component, OnInit, ViewEncapsulation } from "@angular/core"; -import { ImageService, SearchV2Service, RequestService, MessageService, RadarrService, SettingsStateService } from "../../../services"; -import { ActivatedRoute, Router } from "@angular/router"; -import { DomSanitizer } from "@angular/platform-browser"; -import { ICrewViewModel, ISearchMovieResultV2 } from "../../../interfaces/ISearchMovieResultV2"; -import { MatDialog } from "@angular/material/dialog"; -import { YoutubeTrailerComponent } from "../shared/youtube-trailer.component"; -import { AuthService } from "../../../auth/auth.service"; -import { IMovieRequests, RequestType, IAdvancedData } from "../../../interfaces"; -import { DenyDialogComponent } from "../shared/deny-dialog/deny-dialog.component"; -import { NewIssueComponent } from "../shared/new-issue/new-issue.component"; -import { TranslateService } from "@ngx-translate/core"; -import { MovieAdvancedOptionsComponent } from "./panels/movie-advanced-options/movie-advanced-options.component"; -import { RequestServiceV2 } from "../../../services/requestV2.service"; -import { firstValueFrom, forkJoin } from "rxjs"; -import { AdminRequestDialogComponent } from "../../../shared/admin-request-dialog/admin-request-dialog.component"; -import { FeaturesFacade } from "../../../state/features/features.facade"; +import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { ImageService, SearchV2Service, RequestService, MessageService, RadarrService, SettingsStateService } from '../../../services'; +import { ActivatedRoute, Router } from '@angular/router'; +import { DomSanitizer } from '@angular/platform-browser'; +import { ICrewViewModel, ISearchMovieResultV2 } from '../../../interfaces/ISearchMovieResultV2'; +import { MatDialog } from '@angular/material/dialog'; +import { YoutubeTrailerComponent } from '../shared/youtube-trailer.component'; +import { AuthService } from '../../../auth/auth.service'; +import { IMovieRequests, RequestType, IAdvancedData } from '../../../interfaces'; +import { DenyDialogComponent } from '../shared/deny-dialog/deny-dialog.component'; +import { NewIssueComponent } from '../shared/new-issue/new-issue.component'; +import { TranslateService } from '@ngx-translate/core'; +import { MovieAdvancedOptionsComponent } from './panels/movie-advanced-options/movie-advanced-options.component'; +import { RequestServiceV2 } from '../../../services/requestV2.service'; +import { firstValueFrom, forkJoin } from 'rxjs'; +import { AdminRequestDialogComponent } from '../../../shared/admin-request-dialog/admin-request-dialog.component'; +import { FeaturesFacade } from '../../../state/features/features.facade'; @Component({ - templateUrl: "./movie-details.component.html", - styleUrls: ["../../media-details.component.scss"], - encapsulation: ViewEncapsulation.None + templateUrl: './movie-details.component.html', + styleUrls: ['../../media-details.component.scss'], + encapsulation: ViewEncapsulation.None, }) -export class MovieDetailsComponent implements OnInit{ - public movie: ISearchMovieResultV2; - public hasRequest: boolean; - public movieRequest: IMovieRequests; - public isAdmin: boolean; - public advancedOptions: IAdvancedData; - public showAdvanced: boolean; // Set on the UI - public issuesEnabled: boolean; - public roleName4k = "Request4KMovie"; - public is4KEnabled = false; - public requestType = RequestType.movie; - private theMovidDbId: number; - private imdbId: string; - private snapMovieId: string; +export class MovieDetailsComponent implements OnInit { + public movie: ISearchMovieResultV2; + public hasRequest: boolean; + public movieRequest: IMovieRequests; + public isAdmin: boolean; + public advancedOptions: IAdvancedData; + public showAdvanced: boolean; // Set on the UI + public issuesEnabled: boolean; + public roleName4k = 'Request4KMovie'; + public is4KEnabled = false; + public requestType = RequestType.movie; + private theMovidDbId: number; + private imdbId: string; + private snapMovieId: string; + constructor( + private searchService: SearchV2Service, + private route: ActivatedRoute, + private router: Router, + private sanitizer: DomSanitizer, + private imageService: ImageService, + public dialog: MatDialog, + private requestService: RequestService, + private requestService2: RequestServiceV2, + private radarrService: RadarrService, + public messageService: MessageService, + private auth: AuthService, + private settingsState: SettingsStateService, + private translate: TranslateService, + private featureFacade: FeaturesFacade, + ) { + this.snapMovieId = this.route.snapshot.params.movieDbId; + this.route.params.subscribe(async (params: any) => { + if (typeof params.movieDbId === 'string' || params.movieDbId instanceof String) { + if (params.movieDbId.startsWith('tt')) { + this.imdbId = params.movieDbId; + // Check if we user navigated to another movie and if so reload the component + if (this.imdbId !== this.snapMovieId) { + this.reloadComponent(); + } + } + } + this.theMovidDbId = params.movieDbId; + // Check if we user navigated to another movie and if so reload the component + if (params.movieDbId !== this.snapMovieId) { + this.reloadComponent(); + } + }); + } - constructor(private searchService: SearchV2Service, private route: ActivatedRoute, private router: Router, - private sanitizer: DomSanitizer, private imageService: ImageService, - public dialog: MatDialog, private requestService: RequestService, - private requestService2: RequestServiceV2, private radarrService: RadarrService, - public messageService: MessageService, private auth: AuthService, private settingsState: SettingsStateService, - private translate: TranslateService, private featureFacade: FeaturesFacade) { - this.snapMovieId = this.route.snapshot.params.movieDbId; - this.route.params.subscribe(async (params: any) => { - if (typeof params.movieDbId === 'string' || params.movieDbId instanceof String) { - if (params.movieDbId.startsWith("tt")) { - this.imdbId = params.movieDbId; - // Check if we user navigated to another movie and if so reload the component - if (this.imdbId !== this.snapMovieId) { - this.reloadComponent() - } - } - } - this.theMovidDbId = params.movieDbId; - // Check if we user navigated to another movie and if so reload the component - if (params.movieDbId !== this.snapMovieId) { - this.reloadComponent() - } - }); - } + reloadComponent() { + let currentUrl = this.router.url; + this.router.routeReuseStrategy.shouldReuseRoute = () => false; + this.router.onSameUrlNavigation = 'reload'; + this.router.navigate([currentUrl]); + } - reloadComponent() { - let currentUrl = this.router.url; - this.router.routeReuseStrategy.shouldReuseRoute = () => false; - this.router.onSameUrlNavigation = 'reload'; - this.router.navigate([currentUrl]); - } + async ngOnInit() { + this.is4KEnabled = this.featureFacade.is4kEnabled(); + this.issuesEnabled = this.settingsState.getIssue(); + this.isAdmin = this.auth.hasRole('admin') || this.auth.hasRole('poweruser'); - async ngOnInit() { - this.is4KEnabled = this.featureFacade.is4kEnabled(); - this.issuesEnabled = this.settingsState.getIssue(); - this.isAdmin = this.auth.hasRole("admin") || this.auth.hasRole("poweruser"); + if (this.isAdmin) { + this.showAdvanced = await firstValueFrom(this.radarrService.isRadarrEnabled()); + } - if (this.isAdmin) { - this.showAdvanced = await firstValueFrom(this.radarrService.isRadarrEnabled()); - } + if (this.imdbId) { + this.searchService.getMovieByImdbId(this.imdbId).subscribe(async (x) => { + this.movie = x; + this.checkPoster(); + this.movie.credits.crew = this.orderCrew(this.movie.credits.crew); + if (this.movie.requestId > 0) { + // Load up this request + this.hasRequest = true; + this.movieRequest = await this.requestService.getMovieRequest(this.movie.requestId); + } + this.loadBanner(); + }); + } else { + this.searchService.getFullMovieDetails(this.theMovidDbId).subscribe(async (x) => { + this.movie = x; + this.checkPoster(); + this.movie.credits.crew = this.orderCrew(this.movie.credits.crew); + if (this.movie.requestId > 0) { + // Load up this request + this.hasRequest = true; + this.movieRequest = await this.requestService.getMovieRequest(this.movie.requestId); + this.loadAdvancedInfo(); + } + this.loadBanner(); + }); + } + } - if (this.imdbId) { - this.searchService.getMovieByImdbId(this.imdbId).subscribe(async x => { - this.movie = x; - this.checkPoster(); - this.movie.credits.crew = this.orderCrew(this.movie.credits.crew); - if (this.movie.requestId > 0) { - // Load up this request - this.hasRequest = true; - this.movieRequest = await this.requestService.getMovieRequest(this.movie.requestId); - } - this.loadBanner(); - }); - } else { - this.searchService.getFullMovieDetails(this.theMovidDbId).subscribe(async x => { - this.movie = x; - this.checkPoster(); - this.movie.credits.crew = this.orderCrew(this.movie.credits.crew); - if (this.movie.requestId > 0) { - // Load up this request - this.hasRequest = true; - this.movieRequest = await this.requestService.getMovieRequest(this.movie.requestId); - this.loadAdvancedInfo(); - } - this.loadBanner(); - }); - } - } + public async request(is4K: boolean, userId?: string) { + if (!this.is4KEnabled) { + is4K = false; + } + if (this.isAdmin) { + const dialog = this.dialog.open(AdminRequestDialogComponent, { + width: '700px', + data: { type: RequestType.movie, id: this.movie.id, is4K: is4K }, + panelClass: 'modal-panel', + }); + dialog.afterClosed().subscribe(async (result) => { + if (result) { + const requestResult = await firstValueFrom( + this.requestService.requestMovie({ + theMovieDbId: this.theMovidDbId, + languageCode: this.translate.currentLang, + qualityPathOverride: result.radarrPathId, + requestOnBehalf: result.username?.id, + rootFolderOverride: result.radarrFolderId, + is4KRequest: is4K, + }), + ); + if (requestResult.result) { + if (is4K) { + this.movie.has4KRequest = true; + } else { + this.movie.requested = true; + } + this.movie.requestId = requestResult.requestId; + this.messageService.send(this.translate.instant('Requests.RequestAddedSuccessfully', { title: this.movie.title }), 'Ok'); + this.movieRequest = await this.requestService.getMovieRequest(this.movie.requestId); + } else { + this.messageService.sendRequestEngineResultError(requestResult); + } + } + }); + } else { + const result = await firstValueFrom( + this.requestService.requestMovie({ + theMovieDbId: this.theMovidDbId, + languageCode: this.translate.currentLang, + requestOnBehalf: userId, + qualityPathOverride: undefined, + rootFolderOverride: undefined, + is4KRequest: is4K, + }), + ); + if (result.result) { + if (is4K) { + this.movie.has4KRequest = true; + } else { + this.movie.requested = true; + } + this.movie.requestId = result.requestId; + this.movieRequest = await this.requestService.getMovieRequest(this.movie.requestId); + this.messageService.send(this.translate.instant('Requests.RequestAddedSuccessfully', { title: this.movie.title }), 'Ok'); + } else { + this.messageService.sendRequestEngineResultError(result); + } + } + } - public async request(is4K: boolean, userId?: string) { - if (!this.is4KEnabled) { - is4K = false; - } - if (this.isAdmin) { - const dialog = this.dialog.open(AdminRequestDialogComponent, { width: "700px", data: { type: RequestType.movie, id: this.movie.id, is4K: is4K }, panelClass: 'modal-panel' }); - dialog.afterClosed().subscribe(async (result) => { - if (result) { - const requestResult = await firstValueFrom(this.requestService.requestMovie({ theMovieDbId: this.theMovidDbId, - languageCode: this.translate.currentLang, - qualityPathOverride: result.radarrPathId, - requestOnBehalf: result.username?.id, - rootFolderOverride: result.radarrFolderId, - is4KRequest: is4K })); - if (requestResult.result) { - if (is4K) { - this.movie.has4KRequest = true; - } else { - this.movie.requested = true; - } - this.movie.requestId = requestResult.requestId; - this.messageService.send(this.translate.instant("Requests.RequestAddedSuccessfully", { title: this.movie.title }), "Ok"); - this.movieRequest = await this.requestService.getMovieRequest(this.movie.requestId); - } else { - this.messageService.sendRequestEngineResultError(requestResult); - } - } - }); - } else { - const result = await firstValueFrom(this.requestService.requestMovie({ theMovieDbId: this.theMovidDbId, languageCode: this.translate.currentLang, requestOnBehalf: userId, qualityPathOverride: undefined, rootFolderOverride: undefined, is4KRequest: is4K })); - if (result.result) { - if (is4K) { - this.movie.has4KRequest = true; - } else { - this.movie.requested = true; - } - this.movie.requestId = result.requestId; - this.movieRequest = await this.requestService.getMovieRequest(this.movie.requestId); - this.messageService.send(this.translate.instant("Requests.RequestAddedSuccessfully", { title: this.movie.title }), "Ok"); - } else { - this.messageService.sendRequestEngineResultError(result); - } - } - } + public openDialog() { + this.dialog.open(YoutubeTrailerComponent, { + width: '560px', + data: this.movie.videos.results[0].key, + }); + } - public openDialog() { - this.dialog.open(YoutubeTrailerComponent, { - width: '560px', - data: this.movie.videos.results[0].key - }); - } + public async deny() { + const dialogRef = this.dialog.open(DenyDialogComponent, { + width: '250px', + data: { requestId: this.movieRequest.id, requestType: RequestType.movie }, + }); - public async deny() { - const dialogRef = this.dialog.open(DenyDialogComponent, { - width: '250px', - data: { requestId: this.movieRequest.id, requestType: RequestType.movie } - }); + dialogRef.afterClosed().subscribe((result) => { + this.movieRequest.denied = result.denied; + this.movieRequest.deniedReason = result.reason; + }); + } - dialogRef.afterClosed().subscribe(result => { - this.movieRequest.denied = result.denied; - this.movieRequest.deniedReason = result.reason; - }); - } + public async issue() { + let provider = this.movie.id.toString(); + if (this.movie.imdbId) { + provider = this.movie.imdbId; + } + const dialogRef = this.dialog.open(NewIssueComponent, { + width: '500px', + data: { + requestId: this.movieRequest ? this.movieRequest.id : null, + requestType: RequestType.movie, + providerId: provider, + title: this.movie.title, + posterPath: this.movie.posterPath, + }, + }); + } - public async issue() { - let provider = this.movie.id.toString(); - if (this.movie.imdbId) { - provider = this.movie.imdbId; - } - const dialogRef = this.dialog.open(NewIssueComponent, { - width: '500px', - data: { requestId: this.movieRequest ? this.movieRequest.id : null, requestType: RequestType.movie, providerId: provider, title: this.movie.title, posterPath: this.movie.posterPath } - }); - } + public async approve(is4K: boolean) { + const result = await firstValueFrom(this.requestService.approveMovie({ id: this.movieRequest.id, is4K })); + if (result.result) { + if (is4K) { + this.movie.approved4K = true; + } else { + this.movie.approved = true; + } + this.messageService.send(this.translate.instant('Requests.SuccessfullyApproved'), 'Ok'); + } else { + this.messageService.sendRequestEngineResultError(result); + } + } - public async approve(is4K: boolean) { - const result = await firstValueFrom(this.requestService.approveMovie({ id: this.movieRequest.id, is4K })); - if (result.result) { - if (is4K) { - this.movie.approved4K = true; - } else { - this.movie.approved = true; - } - this.messageService.send(this.translate.instant("Requests.SuccessfullyApproved"), "Ok"); - } else { - this.messageService.sendRequestEngineResultError(result); - } - } + public async markAvailable(is4K: boolean) { + const result = await firstValueFrom(this.requestService.markMovieAvailable({ id: this.movieRequest.id, is4K })); + if (result.result) { + if (is4K) { + this.movie.available4K = true; + } else { + this.movie.available = true; + } + this.messageService.send(this.translate.instant('Requests.NowAvailable'), 'Ok'); + } else { + this.messageService.sendRequestEngineResultError(result); + } + } - public async markAvailable(is4K: boolean) { - const result = await firstValueFrom(this.requestService.markMovieAvailable({ id: this.movieRequest.id, is4K })) - if (result.result) { - if (is4K) { - this.movie.available4K = true; - } else { - this.movie.available = true; - } - this.messageService.send(this.translate.instant("Requests.NowAvailable"), "Ok"); - } else { - this.messageService.sendRequestEngineResultError(result); - } - } + public async markUnavailable(is4K: boolean) { + const result = await firstValueFrom(this.requestService.markMovieUnavailable({ id: this.movieRequest.id, is4K })); + if (result.result) { + if (is4K) { + this.movie.available4K = false; + } else { + this.movie.available = false; + } + this.messageService.send(this.translate.instant('Requests.NowUnavailable'), 'Ok'); + } else { + this.messageService.sendRequestEngineResultError(result); + } + } + public setAdvancedOptions(data: IAdvancedData) { + this.advancedOptions = data; + if (data.rootFolderId) { + this.movieRequest.qualityOverrideTitle = data.profiles.filter((x) => x.id == data.profileId)[0].name; + } + if (data.profileId) { + this.movieRequest.rootPathOverrideTitle = data.rootFolders.filter((x) => x.id == data.rootFolderId)[0].path; + } + } - public async markUnavailable(is4K: boolean) { - const result = await firstValueFrom(this.requestService.markMovieUnavailable({ id: this.movieRequest.id, is4K })); - if (result.result) { - if (is4K) { - this.movie.available4K = false; - } else { - this.movie.available = false; - } - this.messageService.send(this.translate.instant("Requests.NowUnavailable"), "Ok"); - } else { - this.messageService.sendRequestEngineResultError(result); - } - } + public async openAdvancedOptions() { + const dialog = this.dialog.open(MovieAdvancedOptionsComponent, { + width: '700px', + data: { movieRequest: this.movieRequest }, + panelClass: 'modal-panel', + }); + await dialog.afterClosed().subscribe(async (result) => { + if (result) { + result.rootFolder = result.rootFolders.filter((f) => f.id === +result.rootFolderId)[0]; + result.profile = result.profiles.filter((f) => f.id === +result.profileId)[0]; + await this.requestService2 + .updateMovieAdvancedOptions({ + qualityOverride: result.profileId, + rootPathOverride: result.rootFolderId, + languageProfile: 0, + requestId: this.movieRequest.id, + }) + .toPromise(); + this.setAdvancedOptions(result); + } + }); + } - public setAdvancedOptions(data: IAdvancedData) { - this.advancedOptions = data; - if (data.rootFolderId) { - this.movieRequest.qualityOverrideTitle = data.profiles.filter(x => x.id == data.profileId)[0].name; - } - if (data.profileId) { - this.movieRequest.rootPathOverrideTitle = data.rootFolders.filter(x => x.id == data.rootFolderId)[0].path; - } - } + public reProcessRequest(is4K: boolean) { + this.requestService2.reprocessRequest(this.movieRequest.id, RequestType.movie, is4K).subscribe((result) => { + if (result.result) { + this.messageService.send(result.message ? result.message : this.translate.instant('Requests.SuccessfullyReprocessed'), 'Ok'); + } else { + this.messageService.sendRequestEngineResultError(result); + } + }); + } - public async openAdvancedOptions() { - const dialog = this.dialog.open(MovieAdvancedOptionsComponent, { width: "700px", data: { movieRequest: this.movieRequest }, panelClass: 'modal-panel' }) - await dialog.afterClosed().subscribe(async result => { - if (result) { - result.rootFolder = result.rootFolders.filter(f => f.id === +result.rootFolderId)[0]; - result.profile = result.profiles.filter(f => f.id === +result.profileId)[0]; - await this.requestService2.updateMovieAdvancedOptions({ qualityOverride: result.profileId, rootPathOverride: result.rootFolderId, languageProfile: 0, requestId: this.movieRequest.id }).toPromise(); - this.setAdvancedOptions(result); - } - }); - } + public notify() { + this.requestService.subscribeToMovie(this.movieRequest.id).subscribe((result) => { + if (result) { + this.movie.subscribed = true; + this.messageService.send(this.translate.instant('Requests.SuccessfulNotify', { title: this.movie.title }), 'Ok'); + } else { + this.messageService.send(this.translate.instant('Requests.CouldntNotify', { title: this.movie.title }), 'Ok'); + } + }); + } - public reProcessRequest(is4K: boolean) { - this.requestService2.reprocessRequest(this.movieRequest.id, RequestType.movie, is4K).subscribe(result => { - if (result.result) { - this.messageService.send(result.message ? result.message : this.translate.instant("Requests.SuccessfullyReprocessed"), "Ok"); - } else { - this.messageService.sendRequestEngineResultError(result); - } - }); - } + public unNotify() { + this.requestService.unSubscribeToMovie(this.movieRequest.id).subscribe((result) => { + if (result) { + this.movie.subscribed = false; + this.messageService.send(this.translate.instant('Requests.SuccessfulUnNotify', { title: this.movie.title }), 'Ok'); + } else { + this.messageService.send(this.translate.instant('Requests.CouldntNotify', { title: this.movie.title }), 'Ok'); + } + }); + } - public notify() { - this.requestService.subscribeToMovie(this.movieRequest.id).subscribe(result => { - if (result) { - this.movie.subscribed = true; - this.messageService.send(this.translate.instant("Requests.SuccessfulNotify", {title: this.movie.title}), "Ok"); - } else { - this.messageService.send(this.translate.instant("Requests.CouldntNotify", {title: this.movie.title}), "Ok"); - } - }); - } + private loadBanner() { + this.imageService.getMovieBanner(this.theMovidDbId.toString()).subscribe((x) => { + if (!this.movie.backdropPath) { + this.movie.background = this.sanitizer.bypassSecurityTrustStyle('url(' + x + ')'); + } else { + this.movie.background = this.sanitizer.bypassSecurityTrustStyle( + 'url(https://image.tmdb.org/t/p/original/' + this.movie.backdropPath + ')', + ); + } + }); + } + private checkPoster() { + if (this.movie.posterPath == null) { + this.movie.posterPath = '../../../images/default_movie_poster.png'; + } else { + this.movie.posterPath = 'https://image.tmdb.org/t/p/w300/' + this.movie.posterPath; + } + } + private loadAdvancedInfo() { + const profile = this.radarrService.getQualityProfilesFromSettings(); + const folders = this.radarrService.getRootFoldersFromSettings(); - public unNotify() { - this.requestService.unSubscribeToMovie(this.movieRequest.id).subscribe(result => { - if (result) { - this.movie.subscribed = false; - this.messageService.send(this.translate.instant("Requests.SuccessfulUnNotify", {title: this.movie.title}), "Ok"); - } else { - this.messageService.send(this.translate.instant("Requests.CouldntNotify", {title: this.movie.title}), "Ok"); - } - }); - } + forkJoin([profile, folders]).subscribe((x) => { + const radarrProfiles = x[0] ?? []; + const radarrRootFolders = x[1] ?? []; - private loadBanner() { - this.imageService.getMovieBanner(this.theMovidDbId.toString()).subscribe(x => { - if (!this.movie.backdropPath) { - this.movie.background = this.sanitizer.bypassSecurityTrustStyle - ("url(" + x + ")"); - } else { - this.movie.background = this.sanitizer.bypassSecurityTrustStyle - ("url(https://image.tmdb.org/t/p/original/" + this.movie.backdropPath + ")"); - } - }); - } - private checkPoster() { - if (this.movie.posterPath == null) { - this.movie.posterPath = "../../../images/default_movie_poster.png"; - } - else { - this.movie.posterPath = "https://image.tmdb.org/t/p/w300/" + this.movie.posterPath - }; - } - private loadAdvancedInfo() { - const profile = this.radarrService.getQualityProfilesFromSettings(); - const folders = this.radarrService.getRootFoldersFromSettings(); + const profile = radarrProfiles.filter((p) => { + return p.id === this.movieRequest.qualityOverride; + }); + if (profile.length > 0) { + this.movieRequest.qualityOverrideTitle = profile[0].name; + } - forkJoin([profile, folders]).subscribe(x => { - const radarrProfiles = x[0]; - const radarrRootFolders = x[1]; + const path = radarrRootFolders.filter((folder) => { + return folder.id === this.movieRequest.rootPathOverride; + }); + if (path.length > 0) { + this.movieRequest.rootPathOverrideTitle = path[0].path; + } + }); + } - const profile = radarrProfiles.filter((p) => { - return p.id === this.movieRequest.qualityOverride; - }); - if (profile.length > 0) { - this.movieRequest.qualityOverrideTitle = profile[0].name; - } - - const path = radarrRootFolders.filter((folder) => { - return folder.id === this.movieRequest.rootPathOverride; - }); - if (path.length > 0) { - this.movieRequest.rootPathOverrideTitle = path[0].path; - } - - }); - } - - private orderCrew(crew: ICrewViewModel[]): ICrewViewModel[] { - return crew.sort((a, b) => { - if (a.job === "Director") { - return -1; - } else if (b.job === "Director") { - return 1; - } else { - return 0; - } - }); - } + private orderCrew(crew: ICrewViewModel[]): ICrewViewModel[] { + return crew.sort((a, b) => { + if (a.job === 'Director') { + return -1; + } else if (b.job === 'Director') { + return 1; + } else { + return 0; + } + }); + } } diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html b/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html index 8d270417d..192507c45 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html +++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html @@ -1,171 +1,240 @@
-
-
-

-

{{ 'MediaDetails.NotEnoughInfo' | translate }}

-
-
- - - - -
- - - - -
-
-
-
- -
- -
-
- - - {{'Search.ViewOnPlex' | translate}} - - - - {{'Search.ViewOnEmby' | translate}} - - - - {{'Search.ViewOnJellyfin' | translate}} - - - - - - - - - - - - - - - - - - - -
-
-
- -
-
- - - - - -
-
-
-
- - - {{tv.overview}} - - -
-
- -
-
-
-
- - -
-
- - - -
- -
- -
- -
- - - -
-
-
- -
- - - - - {{'Requests.Title' | translate}} - - - - - - - -
- - -
- - - -
- - - - - -
-
-
- -
- +
+
+

+

{{ 'MediaDetails.NotEnoughInfo' | translate }}

+
+
+ + +
+ + + +
+
+
+
+ +
+ +
+
+ + + {{ 'Search.ViewOnPlex' | translate }} + + + + {{ 'Search.ViewOnEmby' | translate }} + + + + {{ 'Search.ViewOnJellyfin' | translate }} + + + + + + + + + + + + + + + + + + +
+
+
+ +
+
+ + + + + +
+
+
+
+ + + {{ tv.overview }} + + +
+
+ +
+
+
+
+ +
+
+ +
+ +
+ @defer { + + } @placeholder { + + } +
+ +
+ +
+
+
+ +
+ + + + + {{ 'Requests.Title' | translate }} + + + + @defer (on viewport) { + + } @placeholder { + + } + + +
+
+
+ +
+
+
+
diff --git a/src/Ombi/Controllers/V1/External/RadarrController.cs b/src/Ombi/Controllers/V1/External/RadarrController.cs index 8c5979647..e8b582d95 100644 --- a/src/Ombi/Controllers/V1/External/RadarrController.cs +++ b/src/Ombi/Controllers/V1/External/RadarrController.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Ombi.Api.Radarr; using Ombi.Api.Radarr.Models; +using Ombi.Api.Radarr.Models.V3; using Ombi.Attributes; using Ombi.Core.Settings; using Ombi.Helpers; @@ -77,7 +78,7 @@ namespace Ombi.Controllers.V1.External { return Ok(await _radarrV3Api.GetProfiles(settings.ApiKey, settings.FullUri)); } - return null; + return Ok(new List()); } /// @@ -94,7 +95,7 @@ namespace Ombi.Controllers.V1.External { return Ok(await _radarrV3Api.GetProfiles(settings.ApiKey, settings.FullUri)); } - return null; + return Ok(new List()); } ///