From 2e591122f2de091f76ddf2bdb57aaf29e72ed6f4 Mon Sep 17 00:00:00 2001
From: asuyou <asuyou@users.noreply.github.com>
Date: Fri, 19 Nov 2021 17:57:43 +0000
Subject: Quality stays the same if it exists on next format

---
 ui/src/app/app.component.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'ui/src/app/app.component.ts')

diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts
index 0bab9d1..26ae3c5 100644
--- a/ui/src/app/app.component.ts
+++ b/ui/src/app/app.component.ts
@@ -5,7 +5,7 @@ import { CookieService } from 'ngx-cookie-service';
 
 import { DownloadsService, Status } from './downloads.service';
 import { MasterCheckboxComponent } from './master-checkbox.component';
-import { Formats, Format, Quality, getQualityById } from './formats';
+import { Formats, Format, Quality } from './formats';
 
 @Component({
   selector: 'app-root',
@@ -16,7 +16,7 @@ export class AppComponent implements AfterViewInit {
   addUrl: string;
   formats: Format[] = Formats;
   qualities: Quality[];
-  quality: Quality;
+  quality: string;
   format: string;
   addInProgress = false;
 
@@ -36,8 +36,7 @@ export class AppComponent implements AfterViewInit {
     this.format = cookieService.get('metube_format') || 'any';
     // Needs to be set or qualities won't automatically be set
     this.setQualities()
-    let qualityId = cookieService.get('metube_quality') || this.qualities[0].id
-    this.quality = getQualityById(this.formats, qualityId);
+    this.quality = cookieService.get('metube_quality') || 'best';
   }
 
   ngAfterViewInit() {
@@ -65,7 +64,7 @@ export class AppComponent implements AfterViewInit {
   }
 
   qualityChanged() {
-    this.cookieService.set('metube_quality', this.quality.id, { expires: 3650 });
+    this.cookieService.set('metube_quality', this.quality, { expires: 3650 });
   }
 
   formatChanged() {
@@ -85,12 +84,13 @@ export class AppComponent implements AfterViewInit {
   setQualities() {
     // qualities for specific format
     this.qualities = this.formats.find(el => el.id == this.format).qualities
-    this.quality = this.qualities.find(el => el.value === "best")
+    const exists = this.qualities.find(el => el.id === this.quality)
+    this.quality = exists ? this.quality : 'best'
   }
 
   addDownload(url?: string, quality?: string, format?: string) {
     url = url ?? this.addUrl
-    quality = quality ?? this.quality.value
+    quality = quality ?? this.quality
     format = format ?? this.format
 
     this.addInProgress = true;
-- 
cgit