Jika/akula
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remaining time instead of total time in progrss bar

Browse Source
This commit is contained in:
Jika
2025-07-13 17:31:30 +02:00
parent 6b89127dd0
commit dbee9534c5
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app.rs
View File

@@ -195,7 +195,10 @@ impl App {
self.player.pause(); self.player.pause();
} }
} }
Action::UpdateQueue => self.queue_state.select_first(), Action::UpdateQueue => {
self.queue_state.select_first();
self.player.current_idx = 0;
}
Action::Next => self.player.skip_next(), Action::Next => self.player.skip_next(),
Action::Previous => { Action::Previous => {
let index = self.player.current_idx; let index = self.player.current_idx;
@@ -238,8 +241,7 @@ impl Widget for &mut App {
Mode::Help => {} Mode::Help => {}
Mode::Popup => {} Mode::Popup => {}
Mode::Quit => {} Mode::Quit => {}
Mode::Queue => Mode::Queue => StatefulWidget::render(
StatefulWidget::render(
&Queue::new(self.player.songs_list.clone(), self.player.current_idx), &Queue::new(self.player.songs_list.clone(), self.player.current_idx),
layout[0], layout[0],
buf, buf,
@@ -247,8 +249,7 @@ impl Widget for &mut App {
), ),
}; };
Widget::render(&Progress::new(&self.player), layout[1], buf);
Widget::render(&Progress::new(&self.player), layout[1],buf);
if let Some((title, message)) = &mut self.popup { if let Some((title, message)) = &mut self.popup {
let block = Block::bordered().title(title.as_str()); let block = Block::bordered().title(title.as_str());

16
src/widgets/progress.rs
View File

@@ -20,7 +20,7 @@ impl<'a> Progress<'a> {
impl Widget for &Progress<'_> { impl Widget for &Progress<'_> {
fn render(self, area: ratatui::prelude::Rect, buf: &mut ratatui::prelude::Buffer) { fn render(self, area: ratatui::prelude::Rect, buf: &mut ratatui::prelude::Buffer) {
let ratio = self.player.ratio_played(); let ratio = self.player.ratio_played();
let pos = self.player.current_pos_duration().as_secs(); let current_pos = self.player.current_pos_duration().as_secs();
if let Some(song) = &self if let Some(song) = &self
.player .player
.current_song { .current_song {
@@ -52,19 +52,19 @@ impl Widget for &Progress<'_> {
Text::from(format!( Text::from(format!(
"{:0>2}:{:0>2}:{:0>2} ", "{:0>2}:{:0>2}:{:0>2} ",
pos / (60 * 60), current_pos / (60 * 60),
pos / 60, current_pos / 60,
pos % 60 current_pos % 60
)) ))
.right_aligned() .right_aligned()
.render(inner_layout[0], buf); .render(inner_layout[0], buf);
let pos = song.duration.map(|d| d.to_duration().as_secs() ).unwrap_or_default(); let remaining_duration = song.duration.map(|d| d.to_duration().as_secs() ).unwrap_or_default() - current_pos;
Text::from(format!( Text::from(format!(
" {:0>2}:{:0>2}:{:0>2}", " {:0>2}:{:0>2}:{:0>2}",
pos / (60 * 60), remaining_duration / (60 * 60),
pos / 60, remaining_duration / 60,
pos % 60 remaining_duration % 60
)) ))
.left_aligned() .left_aligned()
.render(inner_layout[2], buf); .render(inner_layout[2], buf);