Refactor playlist / library playlist making

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
 ## bliss 0.8.0
+* Remove the `number_songs` option from `Library::playlist_from_custom`.
+  Since it now returns an Iterator, `number_songs` can just be replaced by `take`.
+* `Library::playlist_from_custom` now returns an Iterator instead of a Vec.
 * `Library::playlist_from_custom` now also returns the song(s) the playlist
   was built from.
 

examples/library.rs

@@ -191,9 +191,9 @@ fn main() -> Result<()> {
             .unwrap_or("20")
             .parse::<usize>()?;
         let library: Library<Config, Decoder> = Library::from_config_path(config_path)?;
-        let songs = library.playlist_from::<()>(&[song_path], playlist_length)?;
-        let song_paths = songs
-            .into_iter()
+        let song_paths = library
+            .playlist_from::<()>(&[song_path])?
+            .take(playlist_length)
             .map(|s| s.bliss_song.path.to_string_lossy().to_string())
             .collect::<Vec<String>>();
         for song in song_paths {

examples/library_extra_info.rs

@@ -209,9 +209,9 @@ fn main() -> Result<()> {
             .unwrap_or("20")
             .parse::<usize>()?;
         let library: Library<Config, Decoder> = Library::from_config_path(config_path)?;
-        let songs = library.playlist_from::<ExtraInfo>(&[song_path], playlist_length)?;
-        let playlist = songs
-            .into_iter()
+        let playlist = library
+            .playlist_from::<ExtraInfo>(&[song_path])?
+            .take(playlist_length)
             .map(|s| {
                 (
                     s.bliss_song.path.to_string_lossy().to_string(),

examples/playlist.rs

@@ -73,21 +73,21 @@ fn main() -> Result<()> {
             Err(e) => println!("error analyzing {}: {}", path.display(), e),
         };
     }
-    analyzed_songs.extend_from_slice(&songs);
     let serialized = serde_json::to_string(&analyzed_songs).unwrap();
-    let mut songs_to_chose_from: Vec<_> = analyzed_songs
+    fs::write(analysis_path, serialized)?;
+
+    analyzed_songs.extend_from_slice(&songs);
+    let songs_to_chose_from: Vec<_> = analyzed_songs
         .into_iter()
         .filter(|x| x == &first_song || paths.contains(&x.path.to_string_lossy().to_string()))
         .collect();
-    closest_to_songs(&[first_song], &mut songs_to_chose_from, &euclidean_distance);
-    dedup_playlist(&mut songs_to_chose_from, None);
-
-    fs::write(analysis_path, serialized)?;
-    let playlist = songs_to_chose_from
-        .iter()
-        .map(|s| s.path.to_string_lossy().to_string())
-        .collect::<Vec<String>>()
-        .join("\n");
+    let playlist = dedup_playlist(
+        closest_to_songs(&[first_song], &songs_to_chose_from, &euclidean_distance),
+        None,
+    )
+    .map(|s| s.path.to_string_lossy().to_string())
+    .collect::<Vec<String>>()
+    .join("\n");
     if let Some(m) = matches.value_of("output-playlist") {
         fs::write(m, playlist)?;
     } else {