From b3a589f1a9d4f84e180623cb32cb826579f52553 Mon Sep 17 00:00:00 2001
From: asuyou <asuyou@users.noreply.github.com>
Date: Mon, 25 Oct 2021 17:15:09 +0100
Subject: Added simple MP3 support

---
 ui/src/app/app.component.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ui/src/app')

diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts
index 55f7e6e..a86bbe1 100644
--- a/ui/src/app/app.component.ts
+++ b/ui/src/app/app.component.ts
@@ -24,7 +24,8 @@ export class AppComponent implements AfterViewInit {
   quality: string;
   formats: Array<Object> = [
     {id: "any", text: "Any"},
-    {id: "mp4", text: "MP4"}
+    {id: "mp4", text: "MP4"},
+    {id: "mp3", text: "MP3"}
   ];
   format: string;
   addInProgress = false;
-- 
cgit 


From d0518142599d326bac12a66e0173eb0e2da2c66d Mon Sep 17 00:00:00 2001
From: asuyou <asuyou@users.noreply.github.com>
Date: Thu, 28 Oct 2021 11:19:17 +0100
Subject: Added quality choice based on format

---
 ui/src/app/app.component.html | 12 ++++++------
 ui/src/app/app.component.ts   | 25 ++++++++++++-------------
 ui/src/app/formats.ts         | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 19 deletions(-)
 create mode 100644 ui/src/app/formats.ts

(limited to 'ui/src/app')

diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html
index 20a78b4..1a90d5f 100644
--- a/ui/src/app/app.component.html
+++ b/ui/src/app/app.component.html
@@ -26,20 +26,20 @@
         <div class="col-md-5 add-url-component">
           <div class="input-group">
             <div class="input-group-prepend">
-              <span class="input-group-text">Video quality</span>
+              <span class="input-group-text">Format</span>
             </div>
-            <select class="custom-select" name="quality" [(ngModel)]="quality" (change)="qualityChanged()" [disabled]="addInProgress || downloads.loading">
-              <option *ngFor="let q of qualities" [ngValue]="q.id">{{ q.text }}</option>
+            <select class="custom-select" name="format" [(ngModel)]="format" (change)="formatChanged()" [disabled]="addInProgress || downloads.loading">
+              <option *ngFor="let f of formats" [ngValue]="f.id">{{ f.text }}</option>
             </select>
           </div>
         </div>
         <div class="col-md-4 add-url-component">
           <div class="input-group">
             <div class="input-group-prepend">
-              <span class="input-group-text">Format</span>
+              <span class="input-group-text">Quality</span>
             </div>
-            <select class="custom-select" name="format" [(ngModel)]="format" (change)="formatChanged()" [disabled]="addInProgress || downloads.loading">
-              <option *ngFor="let f of formats" [ngValue]="f.id">{{ f.text }}</option>
+            <select class="custom-select" name="quality" [(ngModel)]="quality" (change)="qualityChanged()" [disabled]="addInProgress || downloads.loading">
+              <option *ngFor="let q of qualities" [ngValue]="q.id">{{ q.text }}</option>
             </select>
           </div>
         </div>
diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts
index a86bbe1..28b9539 100644
--- a/ui/src/app/app.component.ts
+++ b/ui/src/app/app.component.ts
@@ -5,6 +5,7 @@ import { CookieService } from 'ngx-cookie-service';
 
 import { DownloadsService, Status } from './downloads.service';
 import { MasterCheckboxComponent } from './master-checkbox.component';
+import { Formats, Format, Quality } from './formats';
 
 @Component({
   selector: 'app-root',
@@ -13,20 +14,9 @@ import { MasterCheckboxComponent } from './master-checkbox.component';
 })
 export class AppComponent implements AfterViewInit {
   addUrl: string;
-  qualities: Array<Object> = [
-    {id: "best", text: "Best"},
-    {id: "1440p", text: "1440p"},
-    {id: "1080p", text: "1080p"},
-    {id: "720p", text: "720p"},
-    {id: "480p", text: "480p"},
-    {id: "audio", text: "Audio only"}
-  ];
+  formats: Format[] = Formats;
+  qualities: Quality[];
   quality: string;
-  formats: Array<Object> = [
-    {id: "any", text: "Any"},
-    {id: "mp4", text: "MP4"},
-    {id: "mp3", text: "MP3"}
-  ];
   format: string;
   addInProgress = false;
 
@@ -45,6 +35,8 @@ export class AppComponent implements AfterViewInit {
   constructor(public downloads: DownloadsService, private cookieService: CookieService) {
     this.quality = cookieService.get('metube_quality') || 'best';
     this.format = cookieService.get('metube_format') || 'any';
+    // Needs to be set or qualities won't automatically be set
+    this.setQualities()
   }
 
   ngAfterViewInit() {
@@ -77,6 +69,8 @@ export class AppComponent implements AfterViewInit {
 
   formatChanged() {
     this.cookieService.set('metube_format', this.format, { expires: 3650 });
+    // Updates to use qualities available
+    this.setQualities()
   }
 
   queueSelectionChanged(checked: number) {
@@ -87,6 +81,11 @@ export class AppComponent implements AfterViewInit {
     this.doneDelSelected.nativeElement.disabled = checked == 0;
   }
 
+  setQualities() {
+    // qualities for specific format
+    this.qualities = this.formats.find(el => el.id == this.format).qualities
+  }
+
   addDownload(url?: string, quality?: string, format?: string) {
     url = url ?? this.addUrl
     quality = quality ?? this.quality
diff --git a/ui/src/app/formats.ts b/ui/src/app/formats.ts
new file mode 100644
index 0000000..5264cd0
--- /dev/null
+++ b/ui/src/app/formats.ts
@@ -0,0 +1,39 @@
+export interface Format {
+  id: string;
+  text: string;
+  qualities: Quality[];
+}
+
+export interface Quality {
+  id: string;
+  text: string;
+}
+
+export const Formats: Format[] = [
+  {
+    id: 'any',
+    text: 'Any',
+    qualities: [{ id: 'best', text: 'Best' }],
+  },
+  {
+    id: 'mp4',
+    text: 'MP4',
+    qualities: [
+      { id: 'best', text: 'Best' },
+      { id: '1440', text: '1440p' },
+      { id: '1080', text: '1080p' },
+      { id: '720', text: '720p' },
+      { id: '480', text: '480p' },
+    ],
+  },
+  {
+    id: 'mp3',
+    text: 'MP3',
+    qualities: [
+      { id: 'best', text: 'Best' },
+      { id: '128', text: '128 kbps' },
+      { id: '192', text: '192 kbps' },
+      { id: '320', text: '320 kbps' },
+    ],
+  },
+];
-- 
cgit 


From bae29a4bad5f3ac6177d6f908cc0fc3dac3a71e6 Mon Sep 17 00:00:00 2001
From: asuyou <asuyou@users.noreply.github.com>
Date: Sat, 30 Oct 2021 18:17:13 +0100
Subject: Flipped back around sides of quality and format

---
 ui/src/app/app.component.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'ui/src/app')

diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html
index 1a90d5f..039aab6 100644
--- a/ui/src/app/app.component.html
+++ b/ui/src/app/app.component.html
@@ -26,20 +26,20 @@
         <div class="col-md-5 add-url-component">
           <div class="input-group">
             <div class="input-group-prepend">
-              <span class="input-group-text">Format</span>
+              <span class="input-group-text">Quality</span>
             </div>
-            <select class="custom-select" name="format" [(ngModel)]="format" (change)="formatChanged()" [disabled]="addInProgress || downloads.loading">
-              <option *ngFor="let f of formats" [ngValue]="f.id">{{ f.text }}</option>
+            <select class="custom-select" name="quality" [(ngModel)]="quality" (change)="qualityChanged()" [disabled]="addInProgress || downloads.loading">
+              <option *ngFor="let q of qualities" [ngValue]="q.id">{{ q.text }}</option>
             </select>
           </div>
         </div>
         <div class="col-md-4 add-url-component">
           <div class="input-group">
             <div class="input-group-prepend">
-              <span class="input-group-text">Quality</span>
+              <span class="input-group-text">Format</span>
             </div>
-            <select class="custom-select" name="quality" [(ngModel)]="quality" (change)="qualityChanged()" [disabled]="addInProgress || downloads.loading">
-              <option *ngFor="let q of qualities" [ngValue]="q.id">{{ q.text }}</option>
+            <select class="custom-select" name="format" [(ngModel)]="format" (change)="formatChanged()" [disabled]="addInProgress || downloads.loading">
+              <option *ngFor="let f of formats" [ngValue]="f.id">{{ f.text }}</option>
             </select>
           </div>
         </div>
-- 
cgit 


From 85140fd4ca1abc8431c1b434579f6ed38d06e2a3 Mon Sep 17 00:00:00 2001
From: asuyou <asuyou@users.noreply.github.com>
Date: Mon, 1 Nov 2021 20:37:53 +0000
Subject: Automatically switches to best on format change

---
 ui/src/app/app.component.ts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ui/src/app')

diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts
index 28b9539..ed19618 100644
--- a/ui/src/app/app.component.ts
+++ b/ui/src/app/app.component.ts
@@ -84,6 +84,7 @@ export class AppComponent implements AfterViewInit {
   setQualities() {
     // qualities for specific format
     this.qualities = this.formats.find(el => el.id == this.format).qualities
+    this.quality = "best"
   }
 
   addDownload(url?: string, quality?: string, format?: string) {
-- 
cgit 


From 26798a4930da04d5ce4d54742e0d8ca8d802e9ba Mon Sep 17 00:00:00 2001
From: asuyou <asuyou@users.noreply.github.com>
Date: Wed, 3 Nov 2021 21:57:34 +0000
Subject: Any now shows all avaliable formats

---
 ui/src/app/app.component.html |  2 +-
 ui/src/app/app.component.ts   | 17 +++++++++--------
 ui/src/app/formats.ts         | 39 +++++++++++++++++++++++++++++----------
 3 files changed, 39 insertions(+), 19 deletions(-)

(limited to 'ui/src/app')

diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html
index 039aab6..fda6033 100644
--- a/ui/src/app/app.component.html
+++ b/ui/src/app/app.component.html
@@ -29,7 +29,7 @@
               <span class="input-group-text">Quality</span>
             </div>
             <select class="custom-select" name="quality" [(ngModel)]="quality" (change)="qualityChanged()" [disabled]="addInProgress || downloads.loading">
-              <option *ngFor="let q of qualities" [ngValue]="q.id">{{ q.text }}</option>
+              <option *ngFor="let q of qualities" [ngValue]="q">{{ q.text }}</option>
             </select>
           </div>
         </div>
diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts
index ed19618..dd0b7f1 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 } from './formats';
+import { Formats, Format, Quality, fillQualities, getQualityById } from './formats';
 
 @Component({
   selector: 'app-root',
@@ -14,9 +14,9 @@ import { Formats, Format, Quality } from './formats';
 })
 export class AppComponent implements AfterViewInit {
   addUrl: string;
-  formats: Format[] = Formats;
+  formats: Format[] = fillQualities(Formats);
   qualities: Quality[];
-  quality: string;
+  quality: Quality;
   format: string;
   addInProgress = false;
 
@@ -33,10 +33,11 @@ export class AppComponent implements AfterViewInit {
   faRedoAlt = faRedoAlt;
 
   constructor(public downloads: DownloadsService, private cookieService: CookieService) {
-    this.quality = cookieService.get('metube_quality') || 'best';
     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);
   }
 
   ngAfterViewInit() {
@@ -64,7 +65,7 @@ export class AppComponent implements AfterViewInit {
   }
 
   qualityChanged() {
-    this.cookieService.set('metube_quality', this.quality, { expires: 3650 });
+    this.cookieService.set('metube_quality', this.quality.id, { expires: 3650 });
   }
 
   formatChanged() {
@@ -84,13 +85,13 @@ export class AppComponent implements AfterViewInit {
   setQualities() {
     // qualities for specific format
     this.qualities = this.formats.find(el => el.id == this.format).qualities
-    this.quality = "best"
+    this.quality = this.qualities.find(el => el.value === "best")
   }
 
   addDownload(url?: string, quality?: string, format?: string) {
     url = url ?? this.addUrl
-    quality = quality ?? this.quality
-    format = format ?? this.format
+    quality = quality ?? this.quality.value
+    format = format ?? this.quality.fmt
 
     this.addInProgress = true;
     this.downloads.add(url, quality, format).subscribe((status: Status) => {
diff --git a/ui/src/app/formats.ts b/ui/src/app/formats.ts
index 5264cd0..4f8dd0c 100644
--- a/ui/src/app/formats.ts
+++ b/ui/src/app/formats.ts
@@ -7,33 +7,52 @@ export interface Format {
 export interface Quality {
   id: string;
   text: string;
+  value: string;
+  fmt?: string;
 }
 
 export const Formats: Format[] = [
   {
     id: 'any',
     text: 'Any',
-    qualities: [{ id: 'best', text: 'Best' }],
+    qualities: [],
   },
   {
     id: 'mp4',
     text: 'MP4',
     qualities: [
-      { id: 'best', text: 'Best' },
-      { id: '1440', text: '1440p' },
-      { id: '1080', text: '1080p' },
-      { id: '720', text: '720p' },
-      { id: '480', text: '480p' },
+      { id: "1", value: 'best', text: 'Best MP4' },
+      { id: "2", value: '1440', text: '1440p' },
+      { id: "3", value: '1080', text: '1080p' },
+      { id: "4", value: '720', text: '720p' },
+      { id: "5", value: '480', text: '480p' },
     ],
   },
   {
     id: 'mp3',
     text: 'MP3',
     qualities: [
-      { id: 'best', text: 'Best' },
-      { id: '128', text: '128 kbps' },
-      { id: '192', text: '192 kbps' },
-      { id: '320', text: '320 kbps' },
+      { id: "6", value: 'best', text: 'Best MP3' },
+      { id: "7", value: '128', text: '128 kbps' },
+      { id: "8", value: '192', text: '192 kbps' },
+      { id: "9", value: '320', text: '320 kbps' },
     ],
   },
 ];
+
+export const fillQualities = (formats: Format[]): Format[] => {
+  let allQualities: Quality[] = [];
+  formats.forEach((fmt) => {
+    fmt.qualities = fmt.qualities.map((ql) => ({ ...ql, fmt: fmt.id }));
+    allQualities = allQualities.concat(fmt.qualities);
+  });
+
+  formats.find((format) => format.id === 'any').qualities = allQualities;
+  return formats;
+};
+
+export const getQualityById = (formats: Format[], id: string): Quality => {
+  return formats
+    .find(ql => ql.qualities.find(el => el.id === id)).qualities
+    .find(el => el.id === id)
+}
-- 
cgit 


From b661d4db591c8680905ad22a26a5234066a2c940 Mon Sep 17 00:00:00 2001
From: asuyou <asuyou@users.noreply.github.com>
Date: Sat, 13 Nov 2021 23:49:30 +0000
Subject: Fixed "any" format to act like original

---
 ui/src/app/app.component.ts |  6 +++---
 ui/src/app/formats.ts       | 45 ++++++++++++++++++++-------------------------
 2 files changed, 23 insertions(+), 28 deletions(-)

(limited to 'ui/src/app')

diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts
index dd0b7f1..0bab9d1 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, fillQualities, getQualityById } from './formats';
+import { Formats, Format, Quality, getQualityById } from './formats';
 
 @Component({
   selector: 'app-root',
@@ -14,7 +14,7 @@ import { Formats, Format, Quality, fillQualities, getQualityById } from './forma
 })
 export class AppComponent implements AfterViewInit {
   addUrl: string;
-  formats: Format[] = fillQualities(Formats);
+  formats: Format[] = Formats;
   qualities: Quality[];
   quality: Quality;
   format: string;
@@ -91,7 +91,7 @@ export class AppComponent implements AfterViewInit {
   addDownload(url?: string, quality?: string, format?: string) {
     url = url ?? this.addUrl
     quality = quality ?? this.quality.value
-    format = format ?? this.quality.fmt
+    format = format ?? this.format
 
     this.addInProgress = true;
     this.downloads.add(url, quality, format).subscribe((status: Status) => {
diff --git a/ui/src/app/formats.ts b/ui/src/app/formats.ts
index 4f8dd0c..f24b210 100644
--- a/ui/src/app/formats.ts
+++ b/ui/src/app/formats.ts
@@ -8,51 +8,46 @@ export interface Quality {
   id: string;
   text: string;
   value: string;
-  fmt?: string;
 }
 
 export const Formats: Format[] = [
   {
     id: 'any',
     text: 'Any',
-    qualities: [],
+    qualities: [
+      { id: '0', value: 'best', text: 'Best' },
+      { id: '1', value: '1440', text: '1440p' },
+      { id: '2', value: '1080', text: '1080p' },
+      { id: '3', value: '720', text: '720p' },
+      { id: '4', value: '480', text: '480p' },
+      { id: '5', value: 'audio', text: 'Audio Only' },
+    ],
   },
   {
     id: 'mp4',
     text: 'MP4',
     qualities: [
-      { id: "1", value: 'best', text: 'Best MP4' },
-      { id: "2", value: '1440', text: '1440p' },
-      { id: "3", value: '1080', text: '1080p' },
-      { id: "4", value: '720', text: '720p' },
-      { id: "5", value: '480', text: '480p' },
+      { id: '6', value: 'best', text: 'Best' },
+      { id: '7', value: '1440', text: '1440p' },
+      { id: '8', value: '1080', text: '1080p' },
+      { id: '9', value: '720', text: '720p' },
+      { id: '10', value: '480', text: '480p' },
     ],
   },
   {
     id: 'mp3',
     text: 'MP3',
     qualities: [
-      { id: "6", value: 'best', text: 'Best MP3' },
-      { id: "7", value: '128', text: '128 kbps' },
-      { id: "8", value: '192', text: '192 kbps' },
-      { id: "9", value: '320', text: '320 kbps' },
+      { id: '11', value: 'best', text: 'Best' },
+      { id: '12', value: '128', text: '128 kbps' },
+      { id: '13', value: '192', text: '192 kbps' },
+      { id: '14', value: '320', text: '320 kbps' },
     ],
   },
 ];
 
-export const fillQualities = (formats: Format[]): Format[] => {
-  let allQualities: Quality[] = [];
-  formats.forEach((fmt) => {
-    fmt.qualities = fmt.qualities.map((ql) => ({ ...ql, fmt: fmt.id }));
-    allQualities = allQualities.concat(fmt.qualities);
-  });
-
-  formats.find((format) => format.id === 'any').qualities = allQualities;
-  return formats;
-};
-
 export const getQualityById = (formats: Format[], id: string): Quality => {
   return formats
-    .find(ql => ql.qualities.find(el => el.id === id)).qualities
-    .find(el => el.id === id)
-}
+    .find((ql) => ql.qualities.find((el) => el.id === id))
+    .qualities.find((el) => el.id === id);
+};
-- 
cgit 


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.html |  2 +-
 ui/src/app/app.component.ts   | 14 +++++++-------
 ui/src/app/formats.ts         | 37 +++++++++++++++----------------------
 3 files changed, 23 insertions(+), 30 deletions(-)

(limited to 'ui/src/app')

diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html
index fda6033..039aab6 100644
--- a/ui/src/app/app.component.html
+++ b/ui/src/app/app.component.html
@@ -29,7 +29,7 @@
               <span class="input-group-text">Quality</span>
             </div>
             <select class="custom-select" name="quality" [(ngModel)]="quality" (change)="qualityChanged()" [disabled]="addInProgress || downloads.loading">
-              <option *ngFor="let q of qualities" [ngValue]="q">{{ q.text }}</option>
+              <option *ngFor="let q of qualities" [ngValue]="q.id">{{ q.text }}</option>
             </select>
           </div>
         </div>
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;
diff --git a/ui/src/app/formats.ts b/ui/src/app/formats.ts
index f24b210..bb2fe07 100644
--- a/ui/src/app/formats.ts
+++ b/ui/src/app/formats.ts
@@ -7,7 +7,6 @@ export interface Format {
 export interface Quality {
   id: string;
   text: string;
-  value: string;
 }
 
 export const Formats: Format[] = [
@@ -15,39 +14,33 @@ export const Formats: Format[] = [
     id: 'any',
     text: 'Any',
     qualities: [
-      { id: '0', value: 'best', text: 'Best' },
-      { id: '1', value: '1440', text: '1440p' },
-      { id: '2', value: '1080', text: '1080p' },
-      { id: '3', value: '720', text: '720p' },
-      { id: '4', value: '480', text: '480p' },
-      { id: '5', value: 'audio', text: 'Audio Only' },
+      { id: 'best', text: 'Best' },
+      { id: '1440', text: '1440p' },
+      { id: '1080', text: '1080p' },
+      { id: '720', text: '720p' },
+      { id: '480', text: '480p' },
+      { id: 'audio', text: 'Audio Only' },
     ],
   },
   {
     id: 'mp4',
     text: 'MP4',
     qualities: [
-      { id: '6', value: 'best', text: 'Best' },
-      { id: '7', value: '1440', text: '1440p' },
-      { id: '8', value: '1080', text: '1080p' },
-      { id: '9', value: '720', text: '720p' },
-      { id: '10', value: '480', text: '480p' },
+      { id: 'best', text: 'Best' },
+      { id: '1440', text: '1440p' },
+      { id: '1080', text: '1080p' },
+      { id: '720', text: '720p' },
+      { id: '480', text: '480p' },
     ],
   },
   {
     id: 'mp3',
     text: 'MP3',
     qualities: [
-      { id: '11', value: 'best', text: 'Best' },
-      { id: '12', value: '128', text: '128 kbps' },
-      { id: '13', value: '192', text: '192 kbps' },
-      { id: '14', value: '320', text: '320 kbps' },
+      { id: 'best', text: 'Best' },
+      { id: '128', text: '128 kbps' },
+      { id: '192', text: '192 kbps' },
+      { id: '320', text: '320 kbps' },
     ],
   },
 ];
-
-export const getQualityById = (formats: Format[], id: string): Quality => {
-  return formats
-    .find((ql) => ql.qualities.find((el) => el.id === id))
-    .qualities.find((el) => el.id === id);
-};
-- 
cgit 


From 99c366e5c29a80b3d836fca22c37a7be523fc311 Mon Sep 17 00:00:00 2001
From: asuyou <asuyou@users.noreply.github.com>
Date: Fri, 19 Nov 2021 18:01:02 +0000
Subject: Audio quality sorting now follows mp4

---
 ui/src/app/formats.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui/src/app')

diff --git a/ui/src/app/formats.ts b/ui/src/app/formats.ts
index bb2fe07..15be903 100644
--- a/ui/src/app/formats.ts
+++ b/ui/src/app/formats.ts
@@ -38,9 +38,9 @@ export const Formats: Format[] = [
     text: 'MP3',
     qualities: [
       { id: 'best', text: 'Best' },
-      { id: '128', text: '128 kbps' },
-      { id: '192', text: '192 kbps' },
       { id: '320', text: '320 kbps' },
+      { id: '192', text: '192 kbps' },
+      { id: '128', text: '128 kbps' },
     ],
   },
 ];
-- 
cgit