introduce track data class

src/ui/playlist.rs

@@ -9,6 +9,7 @@ use rspotify::spotify::model::playlist::SimplifiedPlaylist;
 
 use queue::Queue;
 use spotify::Spotify;
+use track::Track;
 
 pub enum PlaylistEvent {
     Refresh,
@@ -49,7 +50,7 @@ impl PlaylistView {
             let tracks = spotify_ref.user_playlist_tracks(&id).unwrap().items;
             let mut locked_queue = queue_ref.lock().expect("Could not aquire lock");
             for playlist_track in tracks {
-                locked_queue.enqueue(playlist_track.track.clone());
+                locked_queue.enqueue(Track::new(&playlist_track.track));
             }
         });
 

src/ui/queue.rs

@@ -8,10 +8,9 @@ use cursive::Cursive;
 use std::sync::Arc;
 use std::sync::Mutex;
 
-use rspotify::spotify::model::track::FullTrack;
-
 use queue::{Queue, QueueChange};
 use spotify::Spotify;
+use track::Track;
 use ui::trackbutton::TrackButton;
 
 pub struct QueueView {
@@ -72,7 +71,7 @@ impl QueueView {
         }
     }
 
-    fn create_button(&self, track: &FullTrack) -> TrackButton {
+    fn create_button(&self, track: &Track) -> TrackButton {
         let mut button = TrackButton::new(&track);
         // 'd' deletes the selected track
         {

src/ui/search.rs

@@ -9,6 +9,7 @@ use std::sync::Mutex;
 
 use queue::Queue;
 use spotify::Spotify;
+use track::Track;
 use ui::trackbutton::TrackButton;
 
 pub struct SearchView {
@@ -29,7 +30,9 @@ impl SearchView {
         results.clear();
 
         if let Ok(tracks) = tracks {
-            for track in tracks.tracks.items {
+            for search_track in tracks.tracks.items {
+                let track = Track::new(&search_track);
+
                 let s = spotify.clone();
                 let mut button = TrackButton::new(&track);
 

src/ui/statusbar.rs

@@ -51,21 +51,6 @@ impl View for StatusBar {
         });
 
         if let Some(ref t) = self.spotify.get_current_track() {
-            let name = format!(
-                "{} - {}",
-                t.artists
-                    .iter()
-                    .map(|ref artist| artist.name.clone())
-                    .collect::<Vec<String>>()
-                    .join(", "),
-                t.name
-            )
-            .to_string();
-
-            let minutes = t.duration_ms / 60000;
-            let seconds = (t.duration_ms % 60000) / 1000;
-            let formatted_duration = format!("{:02}:{:02}", minutes, seconds);
-
             let elapsed = self.spotify.get_current_progress();
             let formatted_elapsed = format!(
                 "{:02}:{:02}",
@@ -73,18 +58,18 @@ impl View for StatusBar {
                 elapsed.as_secs() % 60
             );
 
-            let duration = format!("{} / {} ", formatted_elapsed, formatted_duration);
+            let duration = format!("{} / {} ", formatted_elapsed, t.duration_str());
             let offset = HAlign::Right.get_offset(duration.width(), printer.size.x);
 
             printer.with_color(style, |printer| {
-                printer.print((4, 1), &name);
+                printer.print((4, 1), &t.to_string());
                 printer.print((offset, 1), &duration);
             });
 
             printer.with_color(style_bar, |printer| {
                 printer.print((0, 0), &"—".repeat(printer.size.x));
-                let duration_width = (((printer.size.x as u32) * (elapsed.as_millis() as u32))
-                    / t.duration_ms) as usize;
+                let duration_width =
+                    (((printer.size.x as u32) * (elapsed.as_secs() as u32)) / t.duration) as usize;
                 printer.print((0, 0), &format!("{}{}", "=".repeat(duration_width), ">"));
             });
         } else {

src/ui/trackbutton.rs

@@ -6,15 +6,14 @@ use cursive::traits::View;
 use cursive::vec::Vec2;
 use cursive::Cursive;
 use cursive::Printer;
-use rspotify::spotify::model::track::FullTrack;
 use unicode_width::UnicodeWidthStr;
 
+use track::Track;
+
 pub struct TrackButton {
     callbacks: Vec<(EventTrigger, Callback)>,
 
-    track: FullTrack,
-    title: String,
-    duration: String,
+    track: Track,
 
     enabled: bool,
     last_size: Vec2,
@@ -22,24 +21,10 @@ pub struct TrackButton {
 }
 
 impl TrackButton {
-    pub fn new(track: &FullTrack) -> TrackButton {
-        let artists = track
-            .artists
-            .iter()
-            .map(|ref artist| artist.name.clone())
-            .collect::<Vec<String>>()
-            .join(", ");
-        let formatted_title = format!("{} - {}", artists, track.name);
-
-        let minutes = track.duration_ms / 60000;
-        let seconds = (track.duration_ms % 60000) / 1000;
-        let formatted_duration = format!("{:02}:{:02}", minutes, seconds);
-
+    pub fn new(track: &Track) -> TrackButton {
         TrackButton {
             callbacks: Vec::new(),
             track: track.clone(),
-            title: formatted_title,
-            duration: formatted_duration,
             enabled: true,
             last_size: Vec2::zero(),
             invalidated: true,
@@ -72,9 +57,9 @@ impl View for TrackButton {
         };
 
         // shorten titles that are too long and append ".." to indicate this
-        let mut title_shortened = self.title.clone();
-        title_shortened.truncate(printer.size.x - self.duration.width() - 1);
-        if title_shortened.width() < self.title.width() {
+        let mut title_shortened = self.track.to_string();
+        title_shortened.truncate(printer.size.x - self.track.duration_str().width() - 1);
+        if title_shortened.width() < self.track.to_string().width() {
             let offset = title_shortened.width() - 2;
             title_shortened.replace_range(offset.., "..");
         }
@@ -84,10 +69,10 @@ impl View for TrackButton {
         });
 
         // track duration goes to the end of the line
-        let offset = HAlign::Right.get_offset(self.duration.width(), printer.size.x);
+        let offset = HAlign::Right.get_offset(self.track.duration_str().width(), printer.size.x);
 
         printer.with_color(style, |printer| {
-            printer.print((offset, 0), &self.duration);
+            printer.print((offset, 0), &self.track.duration_str());
         });
     }