From d1d8dcf98d9513da634b372137f2386ae9c91378 Mon Sep 17 00:00:00 2001
From: Djkato <djkatovfx@gmail.com>
Date: Mon, 12 Jun 2023 17:54:04 +0200
Subject: [PATCH] Moved sorting to library.add()

---
 packages/euterpe/src/index.ts       | 8 --------
 packages/music-library/src/index.ts | 3 +++
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/euterpe/src/index.ts b/packages/euterpe/src/index.ts
index 086e4c5..ff8cc0c 100644
--- a/packages/euterpe/src/index.ts
+++ b/packages/euterpe/src/index.ts
@@ -49,7 +49,6 @@ class Euterpe extends Player.MusicPlayer {
                 new_song = this.queue.shift()!
             } else {
                 let id_i = this.db.songs.length;
-                this.db.songs.sort((a, b) => a.id! - b.id!)
                 while (this.db.songs[--id_i].id! > this.current_song_id);
                 const next_id = ++id_i;
 
@@ -81,7 +80,6 @@ class Euterpe extends Player.MusicPlayer {
                 new_song = this.queue.shift()!
             } else {
                 let id_i = this.db.songs.length;
-                this.db.songs.sort((a, b) => a.id! - b.id!)
                 while (this.db.songs[--id_i].id! > this.current_song_id);
                 let next_id = ++id_i
 
@@ -111,7 +109,6 @@ class Euterpe extends Player.MusicPlayer {
             new_song = this.queue.shift()!
         } else {
             let id_i = this.db.songs.length;
-            this.db.songs.sort((a, b) => a.id! - b.id!)
             while (this.db.songs[--id_i].id! > this.current_song_id);
             let next_id = ++id_i;
 
@@ -134,7 +131,6 @@ class Euterpe extends Player.MusicPlayer {
             new_song = this.queue.shift()!
         } else {
             let id_i = this.db.songs.length;
-            this.db.songs.sort((a, b) => a.id! - b.id!)
             while (this.db.songs[--id_i].id! > this.current_song_id);
             const next_id = ++id_i;
             if (next_id == this.db.songs.length) throw new Error("Won't go past the last song")
@@ -215,7 +211,6 @@ class Euterpe extends Player.MusicPlayer {
                 new_song = this.played_history.pop()!
             } else {
                 let id_i = 0;
-                this.db.songs.sort((a, b) => a.id! - b.id!)
                 while (this.db.songs[++id_i].id! < this.current_song_id);
                 const next_id = --id_i;
 
@@ -247,7 +242,6 @@ class Euterpe extends Player.MusicPlayer {
                 new_song = this.played_history.pop()!
             } else {
                 let id_i = -1;
-                this.db.songs.sort((a, b) => a.id! - b.id!)
                 while (this.db.songs[++id_i].id! < this.current_song_id);
                 let next_id = --id_i;
 
@@ -277,7 +271,6 @@ class Euterpe extends Player.MusicPlayer {
             new_song = this.played_history.pop()!
         } else {
             let id_i = 0;
-            this.db.songs.sort((a, b) => a.id! - b.id!)
             while (this.db.songs[++id_i].id! < this.current_song_id);
             const next_id = -id_i;
 
@@ -300,7 +293,6 @@ class Euterpe extends Player.MusicPlayer {
             new_song = this.played_history.pop()!
         } else {
             let id_i = 0;
-            this.db.songs.sort((a, b) => a.id! - b.id!)
             while (this.db.songs[++id_i].id! < this.current_song_id);
             let next_id = -id_i;
 
diff --git a/packages/music-library/src/index.ts b/packages/music-library/src/index.ts
index a081aa9..b873a47 100644
--- a/packages/music-library/src/index.ts
+++ b/packages/music-library/src/index.ts
@@ -205,6 +205,9 @@ class DB {
                 }
             }
         }
+        this.songs.sort((a, b) => a.id! - b.id!)
+        this.collections.sort((a, b) => a.id! - b.id!)
+        this.artists.sort((a, b) => a.id! - b.id!)
     }
 }
 // const db = new DB