From 2da1272ab8725c074c3b509ec5fc3dcb1d8088c5 Mon Sep 17 00:00:00 2001 From: TidusJar Date: Mon, 30 Jul 2018 10:50:05 +0100 Subject: [PATCH] !wip on the TV show --- .../app/interfaces/ISearchTvResult.ts | 7 +++ .../app/search/tvsearch.component.html | 57 +++++++++---------- .../app/search/tvsearch.component.ts | 27 +++++---- .../ClientApp/app/services/search.service.ts | 16 +++--- src/Ombi/tsconfig.json | 2 +- 5 files changed, 56 insertions(+), 53 deletions(-) diff --git a/src/Ombi/ClientApp/app/interfaces/ISearchTvResult.ts b/src/Ombi/ClientApp/app/interfaces/ISearchTvResult.ts index 81d716bfc..bbfef5415 100644 --- a/src/Ombi/ClientApp/app/interfaces/ISearchTvResult.ts +++ b/src/Ombi/ClientApp/app/interfaces/ISearchTvResult.ts @@ -28,8 +28,15 @@ export interface ISearchTvResult { available: boolean; plexUrl: string; embyUrl: string; + quality: string; firstSeason: boolean; latestSeason: boolean; + theTvDbId: string; + subscribed: boolean; + showSubscribe: boolean; + fullyAvailable: boolean; + partlyAvailable: boolean; + background: any; } export interface ITvRequestViewModel { diff --git a/src/Ombi/ClientApp/app/search/tvsearch.component.html b/src/Ombi/ClientApp/app/search/tvsearch.component.html index 6007bd7e2..564b5ffde 100644 --- a/src/Ombi/ClientApp/app/search/tvsearch.component.html +++ b/src/Ombi/ClientApp/app/search/tvsearch.component.html @@ -42,49 +42,46 @@
{{ 'Search.NoResults' | translate }}
- - - {{ 'Search.TvShows.Results' | translate }} - - +
+
-
+
-
+
- poster + poster
- -

{{node.data.title}} ({{node.data.firstAired | date: 'yyyy'}})

+ +

{{node.title}} ({{node.firstAired | date: 'yyyy'}})

 - + {{ 'Search.Movies.HomePage' | translate }} - + {{ 'Search.Movies.Trailer' | translate }} - {{node.data.status}} + {{node.status}} - {{ 'Search.TvShows.AirDate' | translate }} {{node.data.firstAired | date: 'dd/MM/yyyy'}} + {{ 'Search.TvShows.AirDate' | translate }} {{node.firstAired | date: 'dd/MM/yyyy'}} - {{node.data.network}} + {{node.network}} - {{ 'Common.Available' | translate }} + {{ 'Common.Available' | translate }} - {{ 'Common.PartlyAvailable' | translate }} + {{ 'Common.PartlyAvailable' | translate }} @@ -93,25 +90,25 @@

-

{{node.data.overview}}

+

{{node.overview}}

-
+
-
+

-
- + - -
+


@@ -158,7 +155,7 @@
- +

diff --git a/src/Ombi/ClientApp/app/search/tvsearch.component.ts b/src/Ombi/ClientApp/app/search/tvsearch.component.ts index 1002d75f8..8af569d37 100644 --- a/src/Ombi/ClientApp/app/search/tvsearch.component.ts +++ b/src/Ombi/ClientApp/app/search/tvsearch.component.ts @@ -1,7 +1,6 @@ import { PlatformLocation } from "@angular/common"; import { Component, Input, OnInit } from "@angular/core"; import { DomSanitizer } from "@angular/platform-browser"; -import { TreeNode } from "primeng/primeng"; import { Subject } from "rxjs"; import { debounceTime, distinctUntilChanged } from "rxjs/operators"; @@ -18,7 +17,7 @@ export class TvSearchComponent implements OnInit { public searchText: string; public searchChanged = new Subject(); - public tvResults: TreeNode[]; + public tvResults: ISearchTvResult[]; public result: IRequestEngineResult; public searchApplied = false; public defaultPoster: string; @@ -46,7 +45,7 @@ export class TvSearchComponent implements OnInit { this.clearResults(); return; } - this.searchService.searchTvTreeNode(this.searchText) + this.searchService.searchTv(this.searchText) .subscribe(x => { this.tvResults = x; this.searchApplied = true; @@ -138,14 +137,14 @@ export class TvSearchComponent implements OnInit { public getExtraInfo() { this.tvResults.forEach((val, index) => { - this.imageService.getTvBanner(val.data.id).subscribe(x => { + this.imageService.getTvBanner(val.id).subscribe(x => { if (x) { - val.data.background = this.sanitizer. + val.background = this.sanitizer. bypassSecurityTrustStyle ("url(" + x + ")"); } }); - this.searchService.getShowInformationTreeNode(val.data.id) + this.searchService.getShowInformation(val.id) .subscribe(x => { if (x.data) { this.setDefaults(x); @@ -223,17 +222,17 @@ export class TvSearchComponent implements OnInit { this.issueProviderId = req.id.toString(); } - private updateItem(key: TreeNode, updated: TreeNode) { + private updateItem(key: ISearchTvResult, updated: ISearchTvResult) { const index = this.tvResults.indexOf(key, 0); if (index > -1) { // Update certain properties, otherwise we will loose some data - this.tvResults[index].data.title = updated.data.title; - this.tvResults[index].data.banner = updated.data.banner; - this.tvResults[index].data.imdbId = updated.data.imdbId; - this.tvResults[index].data.seasonRequests = updated.data.seasonRequests; - this.tvResults[index].data.seriesId = updated.data.seriesId; - this.tvResults[index].data.fullyAvailable = updated.data.fullyAvailable; - this.tvResults[index].data.backdrop = updated.data.backdrop; + this.tvResults[index].title = updated.title; + this.tvResults[index].banner = updated.banner; + this.tvResults[index].imdbId = updated.imdbId; + this.tvResults[index].seasonRequests = updated.seasonRequests; + this.tvResults[index].seriesId = updated.seriesId; + this.tvResults[index].fullyAvailable = updated.fullyAvailable; + this.tvResults[index].background = updated.banner; } } diff --git a/src/Ombi/ClientApp/app/services/search.service.ts b/src/Ombi/ClientApp/app/services/search.service.ts index a4a85ee36..4454bda0a 100644 --- a/src/Ombi/ClientApp/app/services/search.service.ts +++ b/src/Ombi/ClientApp/app/services/search.service.ts @@ -56,16 +56,16 @@ export class SearchService extends ServiceHelpers { return this.http.get(`${this.url}/Tv/info/${theTvDbId}`, {headers: this.headers}); } - public popularTv(): Observable { - return this.http.get(`${this.url}/Tv/popular/tree`, {headers: this.headers}); + public popularTv(): Observable { + return this.http.get(`${this.url}/Tv/popular`, {headers: this.headers}); } - public mostWatchedTv(): Observable { - return this.http.get(`${this.url}/Tv/mostwatched/tree`, {headers: this.headers}); + public mostWatchedTv(): Observable { + return this.http.get(`${this.url}/Tv/mostwatched`, {headers: this.headers}); } - public anticipatedTv(): Observable { - return this.http.get(`${this.url}/Tv/anticipated/tree`, {headers: this.headers}); + public anticipatedTv(): Observable { + return this.http.get(`${this.url}/Tv/anticipated`, {headers: this.headers}); } - public trendingTv(): Observable { - return this.http.get(`${this.url}/Tv/trending/tree`, {headers: this.headers}); + public trendingTv(): Observable { + return this.http.get(`${this.url}/Tv/trending`, {headers: this.headers}); } } diff --git a/src/Ombi/tsconfig.json b/src/Ombi/tsconfig.json index f6c062ddd..1256bed93 100644 --- a/src/Ombi/tsconfig.json +++ b/src/Ombi/tsconfig.json @@ -11,7 +11,7 @@ "noUnusedLocals": true, "noImplicitThis": true, "noImplicitReturns": true, - "noImplicitAny": true, + "noImplicitAny": false, "suppressImplicitAnyIndexErrors": true, "alwaysStrict": true, "emitDecoratorMetadata": true,