Merge pull request #74 from tsirysndr/fix/remove-track-from-tracklist

tsirysndr · web-flow · commit 7b9e19b5f677 · 2022-11-15T13:40:39.000+03:00
fix(tracklist): resolve bug in `remove_track_at()`
diff --git a/tracklist/src/lib.rs b/tracklist/src/lib.rs
@@ -92,10 +92,15 @@ impl Tracklist {
 
     pub fn remove_track(&mut self, track: Track) {
         self.tracks.retain(|t| t.id != track.id);
+        self.played.retain(|t| t.id != track.id);
     }
 
     pub fn remove_track_at(&mut self, index: usize) {
-        self.tracks.remove(index);
+        if index >= self.played.len() {
+            self.tracks.remove(index - self.played.len());
+            return;
+        }
+        self.played.remove(index);
     }
 
     pub fn insert(&mut self, index: usize, track: Track) {

Original file line number	Diff line number	Diff line change
`@@ -92,10 +92,15 @@ impl Tracklist {`
`92`	`92`
`93`	`93`	`pub fn remove_track(&mut self, track: Track) {`
`94`	`94`	`self.tracks.retain(\|t\| t.id != track.id);`
	`95`	`+ self.played.retain(\|t\| t.id != track.id);`
`95`	`96`	`}`
`96`	`97`
`97`	`98`	`pub fn remove_track_at(&mut self, index: usize) {`
`98`		`- self.tracks.remove(index);`
	`99`	`+ if index >= self.played.len() {`
	`100`	`+ self.tracks.remove(index - self.played.len());`
	`101`	`+ return;`
	`102`	`+ }`
	`103`	`+ self.played.remove(index);`
`99`	`104`	`}`
`100`	`105`
`101`	`106`	`pub fn insert(&mut self, index: usize, track: Track) {`