Commit 3f6b2bf

rmptui3f6b2bf

Fix wrong songs playing when queue is not empty if we are playing a song which is in the middle of somewhere in queue. it will play the wrong song, since the index points to wrong song

+8 −7

3 files changed

−Context 3+

M src/app.rs View

M src/connection.rs View

M src/list.rs View

		@@ -12,7 +12,6 @@ pub struct App {
12	12		/// check if app is running
13	13		pub running: bool,
14	14		pub conn: Connection,
15		−	pub play_deque: ContentList<String>,
16	15		pub song_list: ContentList<String>,
17	16		pub queue_list: ContentList<String>,
18	17		pub pl_list: ContentList<String>,
		@@ -21,11 +20,11 @@ pub struct App {
21	20		impl App {
22	21		pub fn builder(addrs: &str) -> AppResult<Self> {
23	22		let mut conn = Connection::new(addrs).unwrap();
24		−	let mut queue = ContentList::new();
	23	+	let mut queue_list = ContentList::new();
25	24		let mut pl_list = ContentList::new();
26	25		pl_list.list = Self::get_playlist(&mut conn.conn)?;
27	26
28		−	Self::get_queue(&mut conn, &mut queue.list);
	27	+	Self::get_queue(&mut conn, &mut queue_list.list);
29	28
30	29		let mut song_list = ContentList::new();
31	30		song_list.list = conn.songs_filenames.clone();
		@@ -33,9 +32,8 @@ impl App {
33	32		Ok(Self {
34	33		running: true,
35	34		conn,
36		−	play_deque: ContentList::new(),
37	35		song_list,
38		−	queue_list: ContentList::new(),
	36	+	queue_list,
39	37		pl_list,
40	38		})
41	39		}

		@@ -70,10 +70,11 @@ impl Connection {
70	70		self.conn.play().unwrap();
71	71		} else {
72	72		self.conn.push(song)?;
	73	+	let len: u32 = (self.conn.queue().unwrap().len() - 1).try_into().unwrap();
	74	+	self.conn.switch(len)?;
73	75		if self.conn.status()?.state == State::Stop {
74	76		self.conn.play()?;
75	77		}
76		−	self.conn.next().unwrap();
77	78		}
78	79
79	80		Ok(())