diff --git a/src/model/playlist.rs b/src/model/playlist.rs index 8c69ffd..3deaac6 100644 --- a/src/model/playlist.rs +++ b/src/model/playlist.rs @@ -4,7 +4,7 @@ use std::{cmp::Ordering, iter::Iterator}; use rand::{seq::IteratorRandom, thread_rng}; -use log::debug; +use log::{debug, warn}; use rspotify::model::playlist::{FullPlaylist, SimplifiedPlaylist}; use rspotify::model::Id; @@ -56,11 +56,17 @@ impl Playlist { } pub fn delete_track(&mut self, index: usize, spotify: Spotify, library: &Library) -> bool { - let track = self.tracks.as_ref().unwrap()[index].clone(); - debug!("deleting track: {} {:?}", index, track); + let playable = self.tracks.as_ref().unwrap()[index].clone(); + debug!("deleting track: {} {:?}", index, playable); + + if playable.track().map(|t| t.is_local) == Some(true) { + warn!("track is a local file, can't delete"); + return false; + } + match spotify .api - .delete_tracks(&self.id, &self.snapshot_id, &[track]) + .delete_tracks(&self.id, &self.snapshot_id, &[playable]) { false => false, true => { diff --git a/src/model/track.rs b/src/model/track.rs index 8fecff0..cbfe7f4 100644 --- a/src/model/track.rs +++ b/src/model/track.rs @@ -16,7 +16,7 @@ use crate::queue::Queue; use crate::traits::{IntoBoxedViewExt, ListItem, ViewExt}; use crate::ui::listview::ListView; -#[derive(Clone, Deserialize, Serialize)] +#[derive(Clone, Debug, Deserialize, Serialize)] pub struct Track { pub id: Option, pub uri: String, @@ -33,6 +33,7 @@ pub struct Track { pub url: String, pub added_at: Option>, pub list_index: usize, + pub is_local: bool, } impl Track { @@ -69,6 +70,7 @@ impl Track { url: track.id.as_ref().map(|id| id.url()).unwrap_or_default(), added_at: None, list_index: 0, + is_local: track.is_local, } } @@ -106,6 +108,7 @@ impl From<&SimplifiedTrack> for Track { url: track.id.as_ref().map(|id| id.url()).unwrap_or_default(), added_at: None, list_index: 0, + is_local: track.is_local, } } } @@ -145,6 +148,7 @@ impl From<&FullTrack> for Track { url: track.id.as_ref().map(|id| id.url()).unwrap_or_default(), added_at: None, list_index: 0, + is_local: track.is_local, } } } @@ -163,18 +167,6 @@ impl fmt::Display for Track { } } -impl fmt::Debug for Track { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "({} - {} ({:?}))", - self.artists.join(", "), - self.title, - self.id - ) - } -} - impl ListItem for Track { fn is_playing(&self, queue: &Queue) -> bool { let current = queue.get_current(); diff --git a/src/ui/listview.rs b/src/ui/listview.rs index 07f7966..328a3e0 100644 --- a/src/ui/listview.rs +++ b/src/ui/listview.rs @@ -220,6 +220,7 @@ impl View for ListView { let item = &content[i]; let currently_playing = item.is_playing(&self.queue) && self.queue.get_current_index() == Some(i); + let is_local = item.track().map(|t| t.is_local).unwrap_or_default(); let style = if self.selected == i { if currently_playing { @@ -227,6 +228,11 @@ impl View for ListView { *printer.theme.palette.custom("playing_selected").unwrap(), ColorType::Palette(PaletteColor::Highlight), ) + } else if is_local { + ColorStyle::new( + ColorType::Palette(PaletteColor::Secondary), + ColorType::Palette(PaletteColor::Highlight), + ) } else { ColorStyle::highlight() } @@ -235,6 +241,8 @@ impl View for ListView { ColorType::Color(*printer.theme.palette.custom("playing").unwrap()), ColorType::Color(*printer.theme.palette.custom("playing_bg").unwrap()), ) + } else if is_local { + ColorStyle::secondary() } else { ColorStyle::primary() }; diff --git a/src/ui/playlist.rs b/src/ui/playlist.rs index 7133650..78b3e18 100644 --- a/src/ui/playlist.rs +++ b/src/ui/playlist.rs @@ -80,13 +80,16 @@ impl ViewExt for PlaylistView { fn on_command(&mut self, s: &mut Cursive, cmd: &Command) -> Result { if let Command::Delete = cmd { let pos = self.list.get_selected_index(); - if self + + return if self .playlist .delete_track(pos, self.spotify.clone(), &self.library) { self.list.remove(pos); - } - return Ok(CommandResult::Consumed(None)); + Ok(CommandResult::Consumed(None)) + } else { + Err("Could not delete track.".to_string()) + }; } if let Command::Sort(key, direction) = cmd {