From 570a9c394e2ff7283901f73b419e746003158942 Mon Sep 17 00:00:00 2001 From: AustrianToast Date: Sun, 23 Mar 2025 21:36:31 +0100 Subject: [PATCH] forgot to clean up one function --- src/main.rs | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main.rs b/src/main.rs index c044327..613740f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -60,7 +60,7 @@ fn run_with_input( "import" => import_file(client, Option::Some(value))?, "add_url" => add_url(client, Option::Some(value))?, "add_custom_name" => { - let values: Vec = vec![arguments[2].clone(), arguments[3].clone()]; + let values = (arguments[2].clone(), arguments[3].clone()); add_artist_with_custom_name(client, Option::Some(values))? } _ => { @@ -226,24 +226,27 @@ fn add_url(client: &mut postgres::Client, uri: Option) -> Result<(), Box fn add_artist_with_custom_name( client: &mut postgres::Client, - uri_and_artist: Option>, + url_and_artist: Option<(String, String)>, ) -> Result<(), Box> { - let mut url: String = String::new(); - let mut artist_name: String = String::new(); + let mut url = String::new(); + let mut artist_name = String::new(); - match uri_and_artist { - Some(vec) => { - url = vec[0].clone(); - artist_name = vec[1].clone(); + match url_and_artist { + Some(tuple) => { + url = tuple.0; + artist_name = tuple.1; } None => { + println!("Please input the desired url"); io::stdin().read_line(&mut url)?; + + println!("Please input the desired artist name"); io::stdin().read_line(&mut artist_name)?; } }; - let url: &str = url.trim(); - let artist_name: &str = artist_name.trim(); + let url = url.trim(); + let artist_name = artist_name.trim(); let output = client.query_one( "SELECT insert_url_with_custom_artist($1, $2);",