From 329e4acccb47ed2a8e5bfb0c7046993fbc5542b8 Mon Sep 17 00:00:00 2001
From: _Bastler <_Bastler@bstly.de>
Date: Mon, 3 Jan 2022 12:56:29 +0100
Subject: [PATCH] current track on wait

---
 src/app/pages/jukebox/jukebox.component.html | 10 ++++++++++
 src/app/pages/jukebox/jukebox.compontent.ts  |  5 +++++
 src/app/services/jukebox.service.ts          |  4 ++++
 3 files changed, 19 insertions(+)

diff --git a/src/app/pages/jukebox/jukebox.component.html b/src/app/pages/jukebox/jukebox.component.html
index 52690b1..dcfc51d 100644
--- a/src/app/pages/jukebox/jukebox.component.html
+++ b/src/app/pages/jukebox/jukebox.component.html
@@ -59,6 +59,16 @@
     <mat-card-title>{{'jukebox' | i18n}}</mat-card-title>
     <mat-card-subtitle>{{'jukebox.wait' | i18n}}</mat-card-subtitle>
   </mat-card-header>
+  <mat-card-title-group *ngIf="currentTrack">
+    <img *ngIf="getImageUrl(currentTrack)" mat-card-sm-image [src]="getImageUrl(currentTrack)">
+    <mat-card-title><small>{{'jukebox.current' | i18n}}</small></mat-card-title>
+    <mat-card-title>{{currentTrack.name}}</mat-card-title>
+    <mat-card-subtitle>
+      <span *ngFor="let artist of currentTrack.artists; let i = index">
+        {{artist.name}}<span *ngIf="(i+1) < currentTrack.artists.length">, </span>
+      </span>
+    </mat-card-subtitle>
+  </mat-card-title-group>
   <mat-card-content>
     <p *ngIf="timeout">{{'jukebox.timeout' | i18n:timeout}}</p>
   </mat-card-content>
diff --git a/src/app/pages/jukebox/jukebox.compontent.ts b/src/app/pages/jukebox/jukebox.compontent.ts
index b36ca25..fa910c5 100644
--- a/src/app/pages/jukebox/jukebox.compontent.ts
+++ b/src/app/pages/jukebox/jukebox.compontent.ts
@@ -62,6 +62,11 @@ export class JukeboxComponent implements OnInit {
       } else if (error.status == 402) {
         this.wait = true;
         this.timeout = 60 - error.error;
+
+        this.jukeboxService.current().subscribe((response) => {
+          this.currentTrack = response;
+        });
+
         this.timer = setInterval(() => {
           this.timeout--;
           if (this.timeout == 0) {
diff --git a/src/app/services/jukebox.service.ts b/src/app/services/jukebox.service.ts
index dc77b7c..9c263d0 100644
--- a/src/app/services/jukebox.service.ts
+++ b/src/app/services/jukebox.service.ts
@@ -22,6 +22,10 @@ export class JukeboxService {
     searchOffset(query: string, offset: number) {
         return this.http.get(environment.apiUrl + "/jukebox/search?q=" + query + "&offset=" + offset);
     }
+    
+    current() {
+        return this.http.get(environment.apiUrl + "/jukebox/current");
+    }
 
     queue(uri: string) {
         return this.http.post(environment.apiUrl + "/jukebox/queue?uri=" + uri, "");