Implement print_top songs of album

Author: fsktom

src/display.rs

@@ -28,19 +28,30 @@ pub fn print_top(entries: &Vec<SongEntry>, asp: Aspect, num: usize) {
 pub fn print_top_from_artist(entries: &Vec<SongEntry>, asp: Aspect, artist: &Artist, num: usize) {
     match asp {
         Aspect::Songs => {
-            println!("=== TOP {} SONGS FROM {} ===", num, artist.name);
+            println!("=== TOP {} SONGS FROM {} ===", num, artist);
             print_top_helper(gather_songs_with_artist(entries, artist), num);
             println!();
         }
         Aspect::Albums => {
-            println!("=== TOP {} ALBUMS FROM {} ===", num, artist.name);
+            println!("=== TOP {} ALBUMS FROM {} ===", num, artist);
             print_top_helper(gather_albums_with_artist(entries, artist), num);
             println!();
         }
         _ => println!("gay"),
     }
 }
 
+pub fn print_top_from_album(entries: &Vec<SongEntry>, asp: Aspect, album: &Album, num: usize) {
+    match asp {
+        Aspect::Songs => {
+            println!("=== TOP {} SONGS FROM {} ===", num, album);
+            print_top_helper(gather_songs_with_album(entries, album), num);
+            println!();
+        }
+        _ => println!("gay"),
+    }
+}
+
 fn print_top_helper<T: Music>(music_dict: HashMap<T, u32>, num: usize) {
     // https://stackoverflow.com/q/34555837/6694963
     let mut music_vec: Vec<(&T, &u32)> = music_dict.iter().collect();
@@ -116,6 +127,32 @@ fn gather_songs_with_artist(entries: &Vec<SongEntry>, art: &Artist) -> HashMap<S
     songs
 }
 
+fn gather_songs_with_album(entries: &Vec<SongEntry>, alb: &Album) -> HashMap<Song, u32> {
+    let mut songs: HashMap<Song, u32> = HashMap::new();
+
+    for entry in entries {
+        let artist = Artist {
+            name: entry.artist.clone(),
+        };
+        let album = Album {
+            name: entry.album.clone(),
+            artist: artist.clone(),
+        };
+        if album != *alb {
+            continue;
+        }
+        let song = Song {
+            name: entry.track.clone(),
+            album: album.clone(),
+            id: entry.id.clone(),
+        };
+
+        *songs.entry(song).or_insert(0) += 1;
+    }
+
+    songs
+}
+
 fn gather_albums(entries: &Vec<SongEntry>) -> HashMap<Album, u32> {
     let mut albums: HashMap<Album, u32> = HashMap::new();
 

src/main.rs

@@ -7,6 +7,10 @@ use crate::types::Aspect;
 
 fn main() {
     // this is only temporary -> later on these files should be added by CLI args
+    // or both options!
+    // benchmark! =>
+    // 1) paths as CLI args
+    // 2) paths as part of compiled source code!
     let root = "/home/filip/Other/SpotifyData/2021-07/";
     let paths: Vec<String> = vec![
         format!("{}endsong_0.json", root),
@@ -29,4 +33,12 @@ fn main() {
     };
     display::print_top_from_artist(&entries, Aspect::Songs, &powerwolf, 10);
     display::print_top_from_artist(&entries, Aspect::Albums, &powerwolf, 10);
+
+    let coat = types::Album {
+        name: String::from("Coat of Arms"),
+        artist: types::Artist {
+            name: "Sabaton".to_string(),
+        },
+    };
+    display::print_top_from_album(&entries, Aspect::Songs, &coat, 50);
 }