Compare commits

..

4 Commits

4 changed files with 32 additions and 22 deletions

2
.dockerignore Normal file
View File

@ -0,0 +1,2 @@
target/
.idea/

View File

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

18
Dockerfile Normal file
View File

@ -0,0 +1,18 @@
FROM rust:1.55.0-bullseye as builder
# ENV RUSTFLAGS="-C target-feature=+crt-static"
WORKDIR /build
RUN apt-get update && apt-get install -y \
libssl-dev
COPY ./ /build
RUN cargo build --release
FROM gcr.io/distroless/base
COPY --from=builder /build/target/release/songlify /usr/bin/songlify
COPY --from=builder /lib/x86_64-linux-gnu/libgcc_s.so.1 /lib/x86_64-linux-gnu/
COPY --from=builder /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /usr/lib/x86_64-linux-gnu/
ENTRYPOINT /usr/bin/songlify

View File

@ -1,6 +1,5 @@
use crate::SpotifyURL::Track;
use rspotify::blocking::client::Spotify;
use rspotify::blocking::oauth2::SpotifyClientCredentials;
use aspotify::{Client, ClientCredentials};
use teloxide::prelude::*;
enum SpotifyURL {
@ -18,24 +17,16 @@ fn get_spotify_entry(url: &str) -> Option<SpotifyURL> {
return None;
}
fn is_spotify_url(url: &str) -> Option<&str> {
// https://open.spotify.com/track/0VffaI2jwQknRrxpECYHsF?si=1e16c64779744375
if url.contains("https://open.spotify.com/") {
return Some(url);
}
return None;
}
struct TrackInfo {
name: String,
artist: Vec<String>,
}
fn get_spotify_track(spotify: Box<Spotify>, id: &String) -> Option<TrackInfo> {
match spotify.track(id.as_str()) {
async fn get_spotify_track(spotify: Box<Client>, id: &String) -> Option<TrackInfo> {
match spotify.tracks().get_track(id.as_str(), None).await {
Ok(track) => Some(TrackInfo {
name: track.name,
artist: track.artists.iter().map(|x| x.name.clone()).collect(),
name: track.data.name,
artist: track.data.artists.iter().map(|x| x.name.clone()).collect(),
}),
Err(_e) => None,
}
@ -48,19 +39,16 @@ async fn main() {
let bot = Bot::from_env().auto_send();
teloxide::repl(bot, |message| async move {
let spotify_creds = SpotifyClientCredentials::default().build();
let spotify_client = Box::new(
Spotify::default()
.client_credentials_manager(spotify_creds)
.build(),
);
let spotify_creds =
ClientCredentials::from_env().expect("CLIENT_ID and CLIENT_SECRET not found.");
let spotify_client = Box::new(Client::new(spotify_creds));
log::info!("Connected to Spotify");
let text = message.update.text().and_then(get_spotify_entry);
match text {
Some(spotify) => match spotify {
Track(id) => {
let track_info = get_spotify_track(spotify_client, &id);
let track_info = get_spotify_track(spotify_client, &id).await;
match track_info {
Some(info) => {
let reply = format!(
@ -81,4 +69,6 @@ async fn main() {
respond(())
})
.await;
log::info!("Exiting...");
}