1 files changed, 13 insertions, 11 deletions
diff --git a/src/youtube_dl.rs b/src/youtube_dl.rs
index d588760..a917c54 100644
--- a/src/youtube_dl.rs
+++ b/src/youtube_dl.rs
@@ -2,17 +2,22 @@ use std::process::{Command, Stdio};
 use tokio_process::CommandExt;
 use futures::compat::Future01CompatExt;
 
+use serde::{Serialize, Deserialize};
+
 use log::debug;
 
-pub async fn get_audio_download_url(uri: String) -> Result<(String, String), String> {
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct AudioMetadata {
+    pub url: String,
+    pub title: Option<String>,
+}
+
+pub async fn get_audio_download_url(uri: String) -> Result<AudioMetadata, String> {
     let ytdl_args = [
         "--no-playlist",
         "-f",
         "bestaudio/best",
-        "-g",
-        "--get-filename",
-        "-o",
-        "%(title)s",
+        "-j",
         &uri,
     ];
 
@@ -24,15 +29,12 @@ pub async fn get_audio_download_url(uri: String) -> Result<(String, String), Str
 
     let ytdl_output = cmd.output_async().compat().await.unwrap();
 
-    let output = String::from_utf8(ytdl_output.stdout.clone()).unwrap();
-
     if ytdl_output.status.success() == false {
         return Err(String::from_utf8(ytdl_output.stderr.clone()).unwrap());
     }
 
-    let lines = output.lines().collect::<Vec<_>>();
-    let url = lines[0].to_owned();
-    let title = lines[1].to_owned();
+    let output_str = String::from_utf8(ytdl_output.stdout.clone()).unwrap();
+    let output = serde_json::from_str(&output_str).map_err(|e| e.to_string())?;
 
-    Ok((url, title))
+    Ok(output)
 }