Fix sorting issues with unplayed tracks

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hitomi"
-version = "0.3.4"
+version = "0.3.5"
 description = "Builds and updates custom playlists on a Plex server"
 authors = ["Nathaniel Ledford <nate@nateledford.com>"]
 homepage = "https://github.com/nledford/hitomi"

src/plex/models.rs

@@ -81,7 +81,7 @@ pub struct Track {
     pub index: Option<i32>,
     pub parent_index: i32,
     // rating_count: Option<i32>,
-    // user_rating: f32,
+    user_rating: f32,
     view_count: Option<i32>,
     last_viewed_at: Option<i64>,
     // pub last_rated_at: Option<i64>,
@@ -149,6 +149,10 @@ impl Track {
     pub fn never_played(&self) -> bool {
         self.plays() == 0 || self.last_played() == 0
     }
+
+    pub fn rating(&self) -> i32 {
+        (self.user_rating / 2_f32).floor() as i32
+    }
 }
 
 impl Display for Track {

src/profiles/profile_section.rs

@@ -1,3 +1,4 @@
+use std::cmp::Reverse;
 use std::collections::HashMap;
 use std::fmt::{Display, Formatter};
 
@@ -331,9 +332,14 @@ impl ProfileSection {
     }
 
     fn sort_tracks(&mut self) {
+        if self.is_unplayed() {
+            self.tracks
+                .sort_by_key(|t| (Reverse(t.rating()), t.plays(), t.last_played()))
+        }
         if self.is_least_played() {
             self.tracks.sort_by_key(|t| (t.plays(), t.last_played()))
-        } else if self.is_oldest() {
+        }
+        if self.is_oldest() {
             self.tracks.sort_by_key(|t| (t.last_played(), t.plays()))
         }
     }