From 45f42acb8299119df0ca094524081dbfb80e4303 Mon Sep 17 00:00:00 2001
From: johannesd3 <johannesd@outlook.com>
Date: Mon, 22 Feb 2021 09:58:08 +0100
Subject: [PATCH] Refactor 'find_available_alternatives'

---
 playback/Cargo.toml    |  2 +-
 playback/src/player.rs | 29 ++++++++++++++---------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/playback/Cargo.toml b/playback/Cargo.toml
index e32ee7ba..96a0d264 100644
--- a/playback/Cargo.toml
+++ b/playback/Cargo.toml
@@ -19,7 +19,7 @@ version = "0.1.6"
 
 [dependencies]
 futures-executor = { version = "0.3", default_features = false }
-futures-util = { version = "0.3", default_features = false }
+futures-util = { version = "0.3", default_features = false, features = ["alloc"] }
 log = "0.4"
 byteorder = "1.4"
 shell-words = "1.0.0"
diff --git a/playback/src/player.rs b/playback/src/player.rs
index bc4a1dda..9b2c7125 100644
--- a/playback/src/player.rs
+++ b/playback/src/player.rs
@@ -1,4 +1,3 @@
-use std::borrow::Cow;
 use std::cmp::max;
 use std::future::Future;
 use std::io::{self, Read, Seek, SeekFrom};
@@ -8,7 +7,8 @@ use std::time::{Duration, Instant};
 use std::{mem, thread};
 
 use byteorder::{LittleEndian, ReadBytesExt};
-use futures_util::{future, TryFutureExt};
+use futures_util::stream::futures_unordered::FuturesUnordered;
+use futures_util::{future, StreamExt, TryFutureExt};
 use tokio::sync::{mpsc, oneshot};
 
 use crate::audio::{AudioDecoder, AudioError, AudioPacket, PassthroughDecoder, VorbisDecoder};
@@ -576,21 +576,20 @@ struct PlayerTrackLoader {
 }
 
 impl PlayerTrackLoader {
-    async fn find_available_alternative<'a, 'b>(
-        &'a self,
-        audio: &'b AudioItem,
-    ) -> Option<Cow<'b, AudioItem>> {
+    async fn find_available_alternative(&self, audio: AudioItem) -> Option<AudioItem> {
         if audio.available {
-            Some(Cow::Borrowed(audio))
+            Some(audio)
         } else if let Some(alternatives) = &audio.alternatives {
-            let alternatives = alternatives
+            let alternatives: FuturesUnordered<_> = alternatives
                 .iter()
-                .map(|alt_id| AudioItem::get_audio_item(&self.session, *alt_id));
-            let alternatives = future::try_join_all(alternatives).await.unwrap();
+                .map(|alt_id| AudioItem::get_audio_item(&self.session, *alt_id))
+                .collect();
+
             alternatives
-                .into_iter()
-                .find(|alt| alt.available)
-                .map(Cow::Owned)
+                .filter_map(|x| future::ready(x.ok()))
+                .filter(|x| future::ready(x.available))
+                .next()
+                .await
         } else {
             None
         }
@@ -630,10 +629,10 @@ impl PlayerTrackLoader {
 
         info!("Loading <{}> with Spotify URI <{}>", audio.name, audio.uri);
 
-        let audio = match self.find_available_alternative(&audio).await {
+        let audio = match self.find_available_alternative(audio).await {
             Some(audio) => audio,
             None => {
-                warn!("<{}> is not available", audio.uri);
+                warn!("<{}> is not available", spotify_id.to_uri());
                 return None;
             }
         };