fix: use proper sort for quality

Author: asimpson

src/json.rs

@@ -47,8 +47,7 @@ impl Episode {
     }
 
     pub fn get_video_url(&self) -> String {
-        let mut url = String::new();
-        let videos: Vec<&Video> = self
+        let mut videos: Vec<&Video> = self
             .videos
             .iter()
             .filter(|x| x.format == Some("mp4".to_string()))
@@ -59,45 +58,39 @@ impl Episode {
             })
             .collect();
 
-        let preferred_quality: String = videos
-            .iter()
-            .filter(|x| x.bitrate == Some("720p".to_string()))
-            .map(|x| x.url.to_string())
-            .collect();
+        videos.sort_by(|a, b| a.quality_rating().cmp(&b.quality_rating()));
 
-        let second_quality: String = videos
-            .iter()
-            .filter(|x| x.bitrate == Some("4500k".to_string()))
-            .map(|x| x.url.to_string())
-            .collect();
+        return videos[0].proper_url();
+    }
+}
 
-        let third_quality: String = videos
-            .iter()
-            .filter(|x| x.bitrate == Some("1200k".to_string()))
-            .map(|x| x.url.to_string())
-            .collect();
+#[derive(Debug, Deserialize, Clone)]
+pub struct Video {
+    pub url: String,
+    pub bitrate: Option<String>,
+    pub format: Option<String>,
+}
 
-        if third_quality.len() > 0 {
-          url = third_quality;
+impl Video {
+    fn quality_rating(&self) -> u8 {
+        if self.bitrate == Some("720p".to_string()) {
+            return 1;
         }
 
-        if second_quality.len() > 0  {
-          url = second_quality;
+        if self.bitrate == Some("4500k".to_string()) {
+            return 2;
         }
 
-        if preferred_quality.len() > 0 {
-          url = preferred_quality;
+        if self.bitrate == Some("1200k".to_string()) {
+            return 3;
         }
 
-        return url;
+        return 99;
     }
-}
 
-#[derive(Debug, Deserialize, Clone)]
-pub struct Video {
-    pub url: String,
-    pub bitrate: Option<String>,
-    pub format: Option<String>,
+    fn proper_url(&self) -> String {
+        return self.url.to_string();
+    }
 }
 
 #[cfg(test)]