From 23bb7ff32cc2d4b5d44b1fedf0a00d27bfda0d8f Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Sat, 13 Mar 2021 22:51:28 +0100
Subject: [PATCH] Using images uri returned by the api

---
 src/app/app-routing.module.ts                 |  2 +-
 .../items-grid/items-grid.component.html      |  4 +--
 .../items-grid/items-grid.component.ts        |  4 +--
 .../items-list/items-list.component.html      |  5 ++--
 .../items-list/items-list.component.ts        |  4 +--
 .../people-list/people-list.component.html    |  2 +-
 .../people-list/people-list.component.ts      |  4 +--
 .../pages/collection/collection.component.ts  |  2 +-
 src/app/pages/player/player.component.html    |  4 +--
 .../show-details/show-details.component.html  |  6 ++--
 .../show-details/show-details.component.ts    | 30 +++++++++++--------
 11 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 9d729f42..acd605ad 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -73,7 +73,7 @@ const routes: Routes = [
 	},
 
 	{path: "show/:slug", component: ShowDetailsComponent,
-		resolve: {show: ItemResolver.forResource<Show>("shows/:slug?fields=studio,genres")},
+		resolve: {show: ItemResolver.forResource<Show>("shows/:slug?fields=studio,genres,seasons,externalIDs")},
 		canLoad: [AuthGuard.forPermissions("read")],
 		canActivate: [AuthGuard.forPermissions("read")]
 	},
diff --git a/src/app/components/items-grid/items-grid.component.html b/src/app/components/items-grid/items-grid.component.html
index c0c411a9..4b3970c8 100644
--- a/src/app/components/items-grid/items-grid.component.html
+++ b/src/app/components/items-grid/items-grid.component.html
@@ -26,7 +26,7 @@
 	</ng-container>
 
 	<br/>
-	
+
 	<ng-container>
 		<mat-form-field class="w-100 px-3" (click)="$event.stopPropagation();">
 			<mat-label>Studio</mat-label>
@@ -93,7 +93,7 @@
      infinite-scroll (scrolled)="this.page?.loadNext(this.client)" infiniteScrollContainer="#main" fromRoot="true">
 	<a class="show" *ngFor="let item of this.page?.items" draggable="false"
 	   [href]="getLink(item)" [routerLink]="getLink(item)">
-		<div matRipple [style.background-image]="getThumb(item.slug)"></div>
+		<div matRipple [style.background-image]="getPoster(item)"></div>
 		<p class="title">{{item.title ? item.title : item.name}}</p>
 		<p class="date">{{getDate(item)}}</p>
 	</a>
diff --git a/src/app/components/items-grid/items-grid.component.ts b/src/app/components/items-grid/items-grid.component.ts
index c754d7e8..2ff45889 100644
--- a/src/app/components/items-grid/items-grid.component.ts
+++ b/src/app/components/items-grid/items-grid.component.ts
@@ -275,9 +275,9 @@ export class ItemsGridComponent implements OnInit
 		return obj?.name ?? "None";
 	}
 
-	getThumb(slug: string): SafeStyle
+	getPoster(obj: LibraryItem | Show | ShowRole | Collection): SafeStyle
 	{
-		return this.sanitizer.bypassSecurityTrustStyle("url(/poster/" + slug + ")");
+		return this.sanitizer.bypassSecurityTrustStyle(`url(${obj.poster})`);
 	}
 
 	getDate(item: LibraryItem | Show | ShowRole | Collection): string
diff --git a/src/app/components/items-list/items-list.component.html b/src/app/components/items-list/items-list.component.html
index 25408916..819b43e8 100644
--- a/src/app/components/items-list/items-list.component.html
+++ b/src/app/components/items-list/items-list.component.html
@@ -1,8 +1,9 @@
 <div class="scroll-row mb-5">
-	<div class="container" #scrollView (scroll)="onScroll()" infinite-scroll (scrolled)="this.items?.loadNext(this.client)" [horizontal]="true" [scrollWindow]="false">
+	<div class="container" #scrollView (scroll)="onScroll()"
+		 infinite-scroll (scrolled)="this.items?.loadNext(this.client)" [horizontal]="true" [scrollWindow]="false">
 		<a class="item" *ngFor="let item of this.items?.items" draggable="false"
 		   [routerLink]="getLink(item)" [href]="getLink(item)" #itemsDom>
-			<div matRipple [style.background-image]="getThumb(item.slug)"> </div>
+			<div matRipple [style.background-image]="getPoster(item)"> </div>
 			<p class="title">{{item.title ? item.title : item.name}}</p>
 			<p class="date">{{getDate(item)}}</p>
 		</a>
diff --git a/src/app/components/items-list/items-list.component.ts b/src/app/components/items-list/items-list.component.ts
index f358385e..8b1a3e12 100644
--- a/src/app/components/items-list/items-list.component.ts
+++ b/src/app/components/items-list/items-list.component.ts
@@ -22,9 +22,9 @@ export class ItemsListComponent extends HorizontalScroller
 		super();
 	}
 
-	getThumb(slug: string): SafeUrl
+	getPoster(item: LibraryItem | Show | ShowRole | Collection): SafeUrl
 	{
-		return this.sanitizer.bypassSecurityTrustStyle("url(/poster/" + slug + ")");
+		return this.sanitizer.bypassSecurityTrustStyle(`url(${item.poster})`);
 	}
 
 	getDate(item: LibraryItem | Show | ShowRole | Collection): string
diff --git a/src/app/components/people-list/people-list.component.html b/src/app/components/people-list/people-list.component.html
index 730fa2bf..5c5d540a 100644
--- a/src/app/components/people-list/people-list.component.html
+++ b/src/app/components/people-list/people-list.component.html
@@ -4,7 +4,7 @@
 	     [horizontal]="true" [scrollWindow]="false">
 		<a class="people" *ngFor="let people of this.people?.items" draggable="false"
 		   routerLink="/people/{{people.slug}}" href="/people/{{people.slug}}" #itemsDom>
-			<div matRipple [style.background-image]="getPeopleIcon(people.slug)"> </div>
+			<div matRipple [style.background-image]="getPeopleIcon(people)"> </div>
 			<h6 class="name">{{people.name}}</h6>
 			<p class="role">{{people.role}}</p>
 		</a>
diff --git a/src/app/components/people-list/people-list.component.ts b/src/app/components/people-list/people-list.component.ts
index 849a0449..a584a4f2 100644
--- a/src/app/components/people-list/people-list.component.ts
+++ b/src/app/components/people-list/people-list.component.ts
@@ -19,8 +19,8 @@ export class PeopleListComponent extends HorizontalScroller
 		super();
 	}
 
-	getPeopleIcon(slug: string): SafeStyle
+	getPeopleIcon(item: People): SafeStyle
 	{
-		return this.sanitizer.bypassSecurityTrustStyle("url(/peopleimg/" + slug + ")");
+		return this.sanitizer.bypassSecurityTrustStyle(`url(${item.poster})`);
 	}
 }
diff --git a/src/app/pages/collection/collection.component.ts b/src/app/pages/collection/collection.component.ts
index 0f4f56da..081df041 100644
--- a/src/app/pages/collection/collection.component.ts
+++ b/src/app/pages/collection/collection.component.ts
@@ -29,7 +29,7 @@ export class CollectionComponent
 
 	getThumb(): SafeStyle
 	{
-		return this.sanitizer.bypassSecurityTrustStyle("url(" + this.collection.poster + ")");
+		return this.sanitizer.bypassSecurityTrustStyle(`url(${this.collection.poster})`);
 	}
 
 	getDate(item: LibraryItem | Show | ShowRole | Collection | People): string
diff --git a/src/app/pages/player/player.component.html b/src/app/pages/player/player.component.html
index 5d831769..b5b77dd6 100644
--- a/src/app/pages/player/player.component.html
+++ b/src/app/pages/player/player.component.html
@@ -4,7 +4,7 @@
      [style.cursor]="this.showControls ? '' : 'none'">
 	<div class="player data-vjs-player">
 		<video id="player" #player
-		       poster="backdrop/{{this.item.showSlug}}"
+			   [poster]="this.item.backdrop"
 		       autoplay muted
 		       (click)="this.videoClicked()"
 		       (dblclick)="this.fullscreen()"
@@ -75,7 +75,7 @@
 
 		<div class="controller container-fluid" id="controller">
 			<div class="img d-none d-sm-block">
-				<img src="poster/{{this.item.showSlug}}" alt="poster" />
+				<img [src]="this.item.poster" alt="poster" />
 			</div>
 			<div class="content">
 				<h3 *ngIf="!this.item.isMovie">S{{this.item.seasonNumber}}:E{{this.item.episodeNumber}} - {{this.item.title}}</h3>
diff --git a/src/app/pages/show-details/show-details.component.html b/src/app/pages/show-details/show-details.component.html
index 043227c9..e7e55fd4 100644
--- a/src/app/pages/show-details/show-details.component.html
+++ b/src/app/pages/show-details/show-details.component.html
@@ -1,11 +1,11 @@
 <div class="backdrop">
-	<img id="backdrop" src="backdrop/{{this.show.slug}}" alt="backdrop" />
+	<img id="backdrop" [src]="this.show.backdrop" alt="backdrop" />
 </div>
 
 <div class="header container pt-sm-5">
 	<div class="row">
 		<div class="poster d-none d-sm-block">
-			<div [style.background-image]="getThumb(this.show.slug)"></div>
+			<div [style.background-image]="getThumb(this.show)"></div>
 		</div>
 		<div class="main col">
 			<div class="info">
@@ -34,7 +34,7 @@
 			</div>
 		</div>
 		<div class="col-3 secondary d-none d-md-block">
-			<img src="logo/{{this.show.slug}}" #logo alt="" (error)="logo.style.display = 'none'" />
+			<img [src]="this.show.logo" #logo alt="" (error)="logo.style.display = 'none'" />
 
 			<div>
 				<p>Studio: <b><a draggable="false"
diff --git a/src/app/pages/show-details/show-details.component.ts b/src/app/pages/show-details/show-details.component.ts
index 80096bcf..9c07e1a2 100644
--- a/src/app/pages/show-details/show-details.component.ts
+++ b/src/app/pages/show-details/show-details.component.ts
@@ -53,20 +53,18 @@ export class ShowDetailsComponent implements AfterViewInit, OnDestroy
 
 			this.peopleService.getFromShow(this.show.slug).subscribe(x => this.people = x);
 
-			if (this.show.isMovie) {
+			if (this.show.isMovie)
 				return;
-			}
 
-			this.seasonService.getForShow(this.show.slug, {limit: 0}).subscribe(x =>
+			this.seasons = this.show.seasons;
+			if (!this.seasons.find(y => y.seasonNumber === this.season))
 			{
-				this.seasons = x.items;
-				if (x.items.find(y => y.seasonNumber === this.season) == null)
-				{
-					this.season = 1;
-					this.getEpisodes(1);
-				}
-			});
-			this.getEpisodes(this.season); });
+				this.season = 1;
+				this.getEpisodes(1);
+			}
+			else
+				this.getEpisodes(this.season);
+		});
 	}
 
 	ngAfterViewInit(): void
@@ -95,9 +93,9 @@ export class ShowDetailsComponent implements AfterViewInit, OnDestroy
 		this.toolbar.setAttribute("style", `background-color: rgba(0, 0, 0, ${opacity}) !important`);
 	}
 
-	getThumb(slug: string): SafeStyle
+	getThumb(item: Show): SafeStyle
 	{
-		return this.sanitizer.bypassSecurityTrustStyle("url(/poster/" + slug + ")");
+		return this.sanitizer.bypassSecurityTrustStyle(`url(${item.poster})`);
 	}
 
 	playClicked(): void
@@ -119,6 +117,12 @@ export class ShowDetailsComponent implements AfterViewInit, OnDestroy
 		{
 			this.episodes[season] = x;
 		});
+		this.router.navigate([], {
+			relativeTo: this.route,
+			queryParams: {season},
+			replaceUrl: true,
+			queryParamsHandling: "merge",
+		});
 	}
 
 	openTrailer(): void