polpetta
/
Songlify
1
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

Use aspotify, first version working

Davide Polonio 2021-09-22 14:31:19 +02:00
parent c9a252fb9a
commit 0ba77b0aa6
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -10,4 +10,4 @@ teloxide = { version = "0.5", features = ["auto-send", "macros"] }
log = "0.4" log = "0.4"
pretty_env_logger = "0.4.0" pretty_env_logger = "0.4.0"
tokio = { version = "1.8", features = ["rt-multi-thread", "macros"] } tokio = { version = "1.8", features = ["rt-multi-thread", "macros"] }
rspotify = { version = "0.10.0", features = ["blocking"] } aspotify = "0.7.0"

22
src/main.rs
View File

@ -1,6 +1,5 @@
use crate::SpotifyURL::Track; use crate::SpotifyURL::Track;
use rspotify::blocking::client::Spotify; use aspotify::{Client, ClientCredentials, Market};
use rspotify::blocking::oauth2::SpotifyClientCredentials;
use teloxide::prelude::*; use teloxide::prelude::*;
enum SpotifyURL { enum SpotifyURL {
@ -31,11 +30,11 @@ struct TrackInfo {
artist: Vec<String>, artist: Vec<String>,
} }
fn get_spotify_track(spotify: Box<Spotify>, id: &String) -> Option<TrackInfo> { async fn get_spotify_track(spotify: Box<Client>, id: &String) -> Option<TrackInfo> {
match spotify.track(id.as_str()) { match spotify.tracks().get_track(id.as_str(), None).await {
Ok(track) => Some(TrackInfo { Ok(track) => Some(TrackInfo {
name: track.name, name: track.data.name,
artist: track.artists.iter().map(|x| x.name.clone()).collect(), artist: track.data.artists.iter().map(|x| x.name.clone()).collect(),
}), }),
Err(_e) => None, Err(_e) => None,
} }
@ -48,19 +47,16 @@ async fn main() {
let bot = Bot::from_env().auto_send(); let bot = Bot::from_env().auto_send();
teloxide::repl(bot, |message| async move { teloxide::repl(bot, |message| async move {
let spotify_creds = SpotifyClientCredentials::default().build(); let spotify_creds =
let spotify_client = Box::new( ClientCredentials::from_env().expect("CLIENT_ID and CLIENT_SECRET not found.");
Spotify::default() let spotify_client = Box::new(Client::new(spotify_creds));
.client_credentials_manager(spotify_creds)
.build(),
);
log::info!("Connected to Spotify"); log::info!("Connected to Spotify");
let text = message.update.text().and_then(get_spotify_entry); let text = message.update.text().and_then(get_spotify_entry);
match text { match text {
Some(spotify) => match spotify { Some(spotify) => match spotify {
Track(id) => { Track(id) => {
let track_info = get_spotify_track(spotify_client, &id); let track_info = get_spotify_track(spotify_client, &id).await;
match track_info { match track_info {
Some(info) => { Some(info) => {
let reply = format!( let reply = format!(