Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve queue popup #226

Merged
merged 1 commit into from
Jul 29, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 34 additions & 2 deletions spotify_player/src/ui/popup.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use super::{utils::construct_and_render_block, *};
use crate::utils::format_duration;
use std::collections::{btree_map::Entry, BTreeMap};

const SHORTCUT_TABLE_N_COLUMNS: usize = 3;
Expand Down Expand Up @@ -318,6 +319,22 @@ pub fn render_queue_popup(
PlayableItem::Episode(FullEpisode { ref name, .. }) => name,
}
}
fn get_playable_artists(item: &PlayableItem) -> String {
match item {
PlayableItem::Track(FullTrack { ref artists, .. }) => artists
.iter()
.map(|a| a.name.as_str())
.collect::<Vec<_>>()
.join(", "),
PlayableItem::Episode(FullEpisode { .. }) => String::new(),
}
}
fn get_playable_duration(item: &PlayableItem) -> String {
match item {
PlayableItem::Track(FullTrack { ref duration, .. }) => format_duration(duration),
PlayableItem::Episode(FullEpisode { ref duration, .. }) => format_duration(duration),
}
}

let rect = construct_and_render_block("Queue", &ui.theme, state, Borders::ALL, frame, rect);

Expand Down Expand Up @@ -349,12 +366,27 @@ pub fn render_queue_popup(
Row::new(vec![
Cell::from(format!("{}", i + 1)),
Cell::from(get_playable_name(x).to_string()),
Cell::from(get_playable_artists(x).to_string()),
Cell::from(get_playable_duration(x).to_string()),
])
})
.collect::<Vec<_>>(),
)
.header(Row::new(vec![Cell::from("#"), Cell::from("Title")]).style(ui.theme.table_header()))
.widths(&[Constraint::Percentage(10), Constraint::Percentage(90)])
.header(
Row::new(vec![
Cell::from("#"),
Cell::from("Title"),
Cell::from("Artists"),
Cell::from("Duration"),
])
.style(ui.theme.table_header()),
)
.widths(&[
Constraint::Percentage(5),
Constraint::Percentage(40),
Constraint::Percentage(35),
Constraint::Percentage(20),
])
};

frame.render_widget(queue_table, rect);
Expand Down
Loading