From 21c72f72b5a8b56ab16c10e04ba589216cf0e558 Mon Sep 17 00:00:00 2001 From: Dennis Kobert Date: Mon, 2 Mar 2020 17:32:24 +0100 Subject: Fix bug in query --- src/serve.rs | 336 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 168 insertions(+), 168 deletions(-) diff --git a/src/serve.rs b/src/serve.rs index 8aaf1ec..c7cbf8e 100644 --- a/src/serve.rs +++ b/src/serve.rs @@ -8,87 +8,87 @@ use std::collections::HashMap; use std::sync::{Arc, Mutex}; lazy_static! { - static ref CACHE: Arc>> = - Arc::new(Mutex::new(HashMap::new())); + static ref CACHE: Arc>> = + Arc::new(Mutex::new(HashMap::new())); } #[get("/callback//")] pub fn get_tracks(name: String, url: String) -> Result<(), status::Custom> { - let mut guard = CACHE.lock().or(Err(status::Custom( - Status::InternalServerError, - String::from("failed to lock cache mutex"), - )))?; - let mut oauth = guard.remove(&name).ok_or(status::Custom( - Status::NotFound, - String::from("uuid not found in cache"), - ))?; - println!("auth: {:?} url: {}", oauth, url); - let token_info = process_token(&mut oauth, &mut ("?code=".to_owned() + url.as_ref())); - let client_credential = SpotifyClientCredentials::default() - .token_info(token_info.unwrap()) - .build(); + let mut guard = CACHE.lock().or(Err(status::Custom( + Status::InternalServerError, + String::from("failed to lock cache mutex"), + )))?; + let mut oauth = guard.remove(&name).ok_or(status::Custom( + Status::NotFound, + String::from("uuid not found in cache"), + ))?; + println!("auth: {:?} url: {}", oauth, url); + let token_info = process_token(&mut oauth, &mut ("?code=".to_owned() + url.as_ref())); + let client_credential = SpotifyClientCredentials::default() + .token_info(token_info.unwrap()) + .build(); - let spotify = Spotify::default() - .client_credentials_manager(client_credential) - .build(); - let user_id = spotify.current_user().unwrap().id; - let mut client = crate::CLIENT.lock().or(Err(status::Custom( - Status::InternalServerError, - String::from("failed to lock cache mutex"), - )))?; - client - .execute( - "INSERT INTO suser (user_name) VALUES ($1) ON CONFLICT (user_name) DO NOTHING;", - &[&user_id], - ) - .unwrap(); - let uid = get_uid(user_id.as_ref(), &mut client).ok_or(status::Custom( - Status::NotFound, - format!("username {} not found", user_id), - ))?; - client - .execute("DELETE FROM user_track WHERE user_id = $1;", &[&uid]) - .unwrap(); - drop(client); - let chunk_size = 50; - let mut playlist_index = 0; - loop { - match spotify.user_playlists(user_id.as_ref(), Some(chunk_size), Some(playlist_index)) { - Ok(playlists) => { - playlist_index += chunk_size; - if playlists.items.is_empty() { - break; - } - for playlist in playlists.items { - println!("playlist: {:?}", playlist.name); - let mut track_index = 0; + let spotify = Spotify::default() + .client_credentials_manager(client_credential) + .build(); + let user_id = spotify.current_user().unwrap().id; + let mut client = crate::CLIENT.lock().or(Err(status::Custom( + Status::InternalServerError, + String::from("failed to lock cache mutex"), + )))?; + client + .execute( + "INSERT INTO suser (user_name) VALUES ($1) ON CONFLICT (user_name) DO NOTHING;", + &[&user_id], + ) + .unwrap(); + let uid = get_uid(user_id.as_ref(), &mut client).ok_or(status::Custom( + Status::NotFound, + format!("username {} not found", user_id), + ))?; + client + .execute("DELETE FROM user_track WHERE user_id = $1;", &[&uid]) + .unwrap(); + drop(client); + let chunk_size = 50; + let mut playlist_index = 0; + loop { + match spotify.user_playlists(user_id.as_ref(), Some(chunk_size), Some(playlist_index)) { + Ok(playlists) => { + playlist_index += chunk_size; + if playlists.items.is_empty() { + break; + } + for playlist in playlists.items { + println!("playlist: {:?}", playlist.name); + let mut track_index = 0; - loop { - match spotify.user_playlist_tracks( - user_id.as_ref(), - &playlist.id, - None, - Some(chunk_size), - Some(track_index), - None, - ) { - Ok(tracks) => { - track_index += chunk_size; - if tracks.items.is_empty() { - break; - } - for track in tracks.items { - //println!("{:?}", track.track.name); - let mut client = crate::CLIENT.lock().or(Err( - status::Custom(Status::InternalServerError, String::new()), - ))?; + loop { + match spotify.user_playlist_tracks( + user_id.as_ref(), + &playlist.id, + None, + Some(chunk_size), + Some(track_index), + None, + ) { + Ok(tracks) => { + track_index += chunk_size; + if tracks.items.is_empty() { + break; + } + for track in tracks.items { + //println!("{:?}", track.track.name); + let mut client = crate::CLIENT.lock().or(Err( + status::Custom(Status::InternalServerError, String::new()), + ))?; - if track.track.id.is_none() { - println!("{:#?}", track); - continue; - } - print!(" {} ", track.track.id.clone().unwrap()); - client + if track.track.id.is_none() { + println!("{:#?}", track); + continue; + } + print!(" {} ", track.track.id.clone().unwrap()); + client .execute( "INSERT INTO track (track_code, name, artist, popularity) VALUES ($1, $2, $3, $4) @@ -97,107 +97,107 @@ pub fn get_tracks(name: String, url: String) -> Result<(), status::Custom match e.downcast::() { - Ok(ApiError::RateLimited(x)) => std::thread::sleep( - std::time::Duration::from_secs(x.unwrap_or(5) as u64), - ), + } + } + Err(e) => match e.downcast::() { + Ok(ApiError::RateLimited(x)) => std::thread::sleep( + std::time::Duration::from_secs(x.unwrap_or(5) as u64), + ), - cause => { - println!("Error: {:?}", cause); - break; - } - }, - } - } - } - } - Err(e) => match e.downcast::() { - Ok(ApiError::RateLimited(x)) => { - std::thread::sleep(std::time::Duration::from_secs(x.unwrap_or(5) as u64)) - } + cause => { + println!("Error: {:?}", cause); + break; + } + }, + } + } + } + } + Err(e) => match e.downcast::() { + Ok(ApiError::RateLimited(x)) => { + std::thread::sleep(std::time::Duration::from_secs(x.unwrap_or(5) as u64)) + } - cause => { - println!("Error: {:?}", cause); - break; - } - }, - } - } - Ok(()) + cause => { + println!("Error: {:?}", cause); + break; + } + }, + } + } + Ok(()) } #[get("/token/")] pub fn token(name: String) -> Result> { - let state = rspotify::spotify::util::generate_random_string(16); - let oauth = SpotifyOAuth::default(); - //let callback = oauth.redirect_uri.clone(); - let oauth = oauth + let state = rspotify::spotify::util::generate_random_string(16); + let oauth = SpotifyOAuth::default(); + //let callback = oauth.redirect_uri.clone(); + let oauth = oauth .scope("playlist-read-private, playlist-read-collaborative, user-read-private, user-follow-read, user-library-read") //.redirect_uri(format!("{}/{}", callback, &state).as_ref()) .build(); - let auth_url = oauth.get_authorize_url(Some(&state), None); - match CACHE.lock() { - Ok(mut guard) => { - guard.insert(name, oauth); - Ok(Redirect::to(auth_url)) - } - Err(_) => Err(status::Custom( - Status::ImATeapot, - "Internal Server Error".to_owned(), - )), - } + let auth_url = oauth.get_authorize_url(Some(&state), None); + match CACHE.lock() { + Ok(mut guard) => { + guard.insert(name, oauth); + Ok(Redirect::to(auth_url)) + } + Err(_) => Err(status::Custom( + Status::ImATeapot, + "Internal Server Error".to_owned(), + )), + } } fn get_uid(name: &str, client: &mut postgres::Client) -> Option { - match client.query("SELECT user_id FROM suser where user_name = $1;", &[&name]) { - Ok(rows) => match rows.len() { - 0 => None, - x => { - let x: i32 = rows[0].get(0); - Some(x) - } - }, - _ => None, - } + match client.query("SELECT user_id FROM suser where user_name = $1;", &[&name]) { + Ok(rows) => match rows.len() { + 0 => None, + x => { + let x: i32 = rows[0].get(0); + Some(x) + } + }, + _ => None, + } } #[get("/match//")] pub fn match_users(name1: String, name2: String) -> Result> { - let mut client = crate::CLIENT.lock().unwrap(); - let uid1 = get_uid(name1.as_ref(), &mut client) - .ok_or(status::NotFound(format!("username {} not found", name1)))?; - let uid2 = get_uid(name2.as_ref(), &mut client) - .ok_or(status::NotFound(format!("username {} not found", name2)))?; - let mut songs = String::new(); - for row in client - .query( - " + let mut client = crate::CLIENT.lock().unwrap(); + let uid1 = get_uid(name1.as_ref(), &mut client) + .ok_or(status::NotFound(format!("username {} not found", name1)))?; + let uid2 = get_uid(name2.as_ref(), &mut client) + .ok_or(status::NotFound(format!("username {} not found", name2)))?; + let mut songs = String::new(); + for row in client + .query( + " WITH users AS ( SELECT * FROM ( VALUES @@ -221,26 +221,26 @@ pub fn match_users(name1: String, name2: String) -> Result Result> { - let mut client = crate::CLIENT.lock().unwrap(); - let mut users = String::new(); - for row in client.query("SELECT user_name FROM suser", &[]).unwrap() { - let user: String = row.get(0); - users = format!("{}{}\n", users, user); - } - Ok(users) + let mut client = crate::CLIENT.lock().unwrap(); + let mut users = String::new(); + for row in client.query("SELECT user_name FROM suser", &[]).unwrap() { + let user: String = row.get(0); + users = format!("{}{}\n", users, user); + } + Ok(users) } -- cgit v1.2.3