Compare commits

..

No commits in common. "c2307b53a7576f1103acc61b90c3d8b5399d1268" and "63eb891f91312d5d7c0470fded76c0a2c3d5b403" have entirely different histories.

17 changed files with 49 additions and 192 deletions

View File

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

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ Cargo.lock
# These are backup files generated by rustfmt # These are backup files generated by rustfmt
**/*.rs.bk **/*.rs.bk

View File

@ -1,11 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<codeStyleSettings language="XML">
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="4" />
<option name="TAB_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
</code_scheme>
</component>

View File

@ -1,5 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
</state>
</component>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GoogleJavaFormatSettings">
<option name="enabled" value="true" />
</component>
</project>

View File

@ -3,4 +3,7 @@
<component name="ProjectRootManager"> <component name="ProjectRootManager">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> <component name="ScalaSbtSettings">
<option name="customVMPath" />
</component>
</project>

View File

@ -5,4 +5,4 @@
<module fileurl="file://$PROJECT_DIR$/songlify.iml" filepath="$PROJECT_DIR$/songlify.iml" /> <module fileurl="file://$PROJECT_DIR$/songlify.iml" filepath="$PROJECT_DIR$/songlify.iml" />
</modules> </modules>
</component> </component>
</project> </project>

View File

@ -7,4 +7,4 @@
</set> </set>
</option> </option>
</component> </component>
</project> </project>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ScalaSbtSettings">
<option name="customVMPath" />
</component>
</project>

View File

@ -3,4 +3,4 @@
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" /> <mapping directory="" vcs="Git" />
</component> </component>
</project> </project>

View File

@ -1,17 +0,0 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
hooks:
- id: trailing-whitespace
- id: check-merge-conflict
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files
- repo: https://github.com/doublify/pre-commit-rust
rev: v1.0
hooks:
- id: fmt
args: ['--verbose', '--']
- id: cargo-check

View File

@ -1,6 +1,6 @@
[package] [package]
name = "songlify" name = "songlify"
version = "0.2.1" version = "0.2.0"
edition = "2018" edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -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"] }
aspotify = "0.7.0" aspotify = "0.7.0"

View File

@ -15,4 +15,4 @@ 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 /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/ COPY --from=builder /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /usr/lib/x86_64-linux-gnu/
ENTRYPOINT /usr/bin/songlify ENTRYPOINT /usr/bin/songlify

View File

@ -1,3 +1,3 @@
# Songlify # Songlify
A Telegram bot that gives you information about the song other people share with you in chat. A Telegram bot that gives you information about the song other people share with you in chat.

View File

@ -9,4 +9,4 @@
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
</module> </module>

View File

@ -1,9 +1,8 @@
use teloxide::prelude::*; use teloxide::prelude::*;
use crate::spotify::TrackInfo;
use spotify::SpotifyKind::Track; use spotify::SpotifyKind::Track;
use crate::spotify::SpotifyKind::{Album, Playlist}; use crate::spotify::SpotifyKind::Album;
mod spotify; mod spotify;
@ -14,14 +13,14 @@ 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 text = message.update.text().and_then(spotify::get_entry_kind); let text = message.update.text().and_then(spotify::get_spotify_entry);
match text { match text {
Some(spotify) => { Some(spotify) => {
let spotify_client = spotify::get_client(); let spotify_client = spotify::get_spotify_client();
match spotify { match spotify {
Track(id) => { Track(id) => {
log::debug!("Parsing spotify song: {}", id); log::debug!("Parsing spotify song: {}", id);
let track_info = spotify::get_track(spotify_client, &id).await; let track_info = spotify::get_spotify_track(spotify_client, &id).await;
match track_info { match track_info {
Some(info) => { Some(info) => {
let reply = format!( let reply = format!(
@ -40,15 +39,14 @@ async fn main() {
} }
Album(id) => { Album(id) => {
log::debug!("Parsing spotify album: {}", id); log::debug!("Parsing spotify album: {}", id);
let album_info = spotify::get_album(spotify_client, &id).await; let album_info = spotify::get_spotify_album(spotify_client, &id).await;
match album_info { match album_info {
Some(info) => { Some(info) => {
let mut reply = format!( let mut reply = format!(
"Album information:\n\ "Album information:\n\
🎵 Album name: {}\n\ 🎵 Album name name: {}\n\
🧑🎤 {} artist(s): {}", 🧑🎤 Artist(s): {}",
info.name, info.name,
info.artists.len(),
info.artists.join(", ") info.artists.join(", ")
); );
if !info.genres.is_empty() { if !info.genres.is_empty() {
@ -57,33 +55,15 @@ async fn main() {
.as_str(), .as_str(),
); );
} }
Some( if !info.songs.is_empty() {
message let songs = info
.reply_to(add_track_section(info.tracks, reply)) .songs
.await?, .iter()
) .map(|x| x.name.clone() + "\n")
} .collect::<String>();
None => None, reply.push_str(format!("\n🎶 Song(s): {}", songs).as_str());
} }
} Some(message.reply_to(reply).await?)
Playlist(id) => {
log::debug!("Parsing spotify playlist: {}", id);
let playlist_info = spotify::get_playlist(spotify_client, &id).await;
match playlist_info {
Some(info) => {
let reply = format!(
"Playlist information:\n\
Playlist name: {}\n\
🧑🎤 {} artist(s): {}",
info.name,
info.artists.len(),
info.artists.join(", ")
);
Some(
message
.reply_to(add_track_section(info.tracks, reply))
.await?,
)
} }
None => None, None => None,
} }
@ -98,16 +78,3 @@ async fn main() {
log::info!("Exiting..."); log::info!("Exiting...");
} }
fn add_track_section(tracks: Vec<TrackInfo>, reply: String) -> String {
if !tracks.is_empty() {
let songs = tracks
.iter()
.map(|x| x.name.clone() + "\n")
.collect::<String>();
reply
.clone()
.push_str(format!("\n🎶 {} Track(s): {}", tracks.len(), songs).as_str())
}
reply
}

View File

@ -1,31 +1,10 @@
use std::time::Duration; use std::time::Duration;
use aspotify::PlaylistItemType::{Episode, Track}; use aspotify::{Client, ClientCredentials};
use aspotify::{Client, ClientCredentials, TrackSimplified};
pub enum SpotifyKind { pub enum SpotifyKind {
Track(String), Track(String),
Album(String), Album(String),
Playlist(String),
}
pub struct TrackInfo {
pub(crate) name: String,
pub(crate) artists: Vec<String>,
pub(crate) duration: Duration,
}
pub struct AlbumInfo {
pub(crate) name: String,
pub(crate) artists: Vec<String>,
pub(crate) genres: Vec<String>,
pub(crate) tracks: Vec<TrackInfo>,
}
pub struct PlaylistInfo {
pub(crate) name: String,
pub(crate) artists: Vec<String>,
pub(crate) tracks: Vec<TrackInfo>,
} }
fn get_id_in_url(url: &str) -> Option<&str> { fn get_id_in_url(url: &str) -> Option<&str> {
@ -35,14 +14,7 @@ fn get_id_in_url(url: &str) -> Option<&str> {
.and_then(|x| x.split('?').next()) .and_then(|x| x.split('?').next())
} }
fn extract_artists_from_tracks(tracks: Vec<TrackSimplified>) -> Vec<String> { pub fn get_spotify_entry(url: &str) -> Option<SpotifyKind> {
tracks
.iter()
.flat_map(|t| t.artists.iter().map(|a| a.name.clone()))
.collect()
}
pub fn get_entry_kind(url: &str) -> Option<SpotifyKind> {
if url.contains("https://open.spotify.com/track/") { if url.contains("https://open.spotify.com/track/") {
let track_id = get_id_in_url(url); let track_id = get_id_in_url(url);
return match track_id { return match track_id {
@ -57,24 +29,30 @@ pub fn get_entry_kind(url: &str) -> Option<SpotifyKind> {
None => None, None => None,
}; };
} }
if url.contains("https://open.spotify.com/playlist/") {
let playlist_id = get_id_in_url(url);
return match playlist_id {
Some(id) => Some(SpotifyKind::Playlist(id.to_string())),
None => None,
};
}
return None; return None;
} }
pub fn get_client() -> Box<Client> { pub fn get_spotify_client() -> Box<Client> {
let spotify_creds = let spotify_creds =
ClientCredentials::from_env().expect("CLIENT_ID and CLIENT_SECRET not found."); ClientCredentials::from_env().expect("CLIENT_ID and CLIENT_SECRET not found.");
let spotify_client = Box::new(Client::new(spotify_creds)); let spotify_client = Box::new(Client::new(spotify_creds));
spotify_client spotify_client
} }
pub async fn get_track(spotify: Box<Client>, id: &String) -> Option<TrackInfo> { pub struct TrackInfo {
pub(crate) name: String,
pub(crate) artists: Vec<String>,
pub(crate) duration: Duration,
}
pub struct AlbumInfo {
pub(crate) name: String,
pub(crate) artists: Vec<String>,
pub(crate) genres: Vec<String>,
pub(crate) songs: Vec<TrackInfo>,
}
pub async fn get_spotify_track(spotify: Box<Client>, id: &String) -> Option<TrackInfo> {
match spotify.tracks().get_track(id.as_str(), None).await { match spotify.tracks().get_track(id.as_str(), None).await {
Ok(track) => Some(TrackInfo { Ok(track) => Some(TrackInfo {
name: track.data.name, name: track.data.name,
@ -85,60 +63,13 @@ pub async fn get_track(spotify: Box<Client>, id: &String) -> Option<TrackInfo> {
} }
} }
pub async fn get_album(spotify: Box<Client>, id: &String) -> Option<AlbumInfo> { pub async fn get_spotify_album(spotify: Box<Client>, id: &String) -> Option<AlbumInfo> {
match spotify.albums().get_album(id.as_str(), None).await { match spotify.albums().get_album(id.as_str(), None).await {
Ok(album) => Some(AlbumInfo { Ok(album) => Some(AlbumInfo {
name: album.data.name, name: album.data.name,
artists: album.data.artists.iter().map(|x| x.name.clone()).collect(), artists: album.data.artists.iter().map(|x| x.name.clone()).collect(),
genres: album.data.genres, genres: album.data.genres,
tracks: album songs: vec![], // TODO we could lookup songs and put them here!
.data
.tracks
.items
.iter()
.map(|t| TrackInfo {
name: t.name.clone(),
artists: t.artists.iter().map(|x| x.name.clone()).collect(),
duration: t.duration,
})
.collect(),
}),
Err(_e) => None,
}
}
pub async fn get_playlist(spotify: Box<Client>, id: &String) -> Option<PlaylistInfo> {
match spotify.playlists().get_playlist(id.as_str(), None).await {
Ok(playlist) => Some(PlaylistInfo {
name: playlist.data.name,
artists: playlist
.data
.tracks
.items
.iter()
.flat_map(|p| {
p.item.as_ref().map_or(Vec::new(), |x| match x {
Track(t) => extract_artists_from_tracks(vec![t.clone().simplify()]),
Episode(_e) => Vec::new(),
})
})
.collect(),
tracks: playlist
.data
.tracks
.items
.iter()
.flat_map(|p| {
p.item.as_ref().map_or(None, |x| match x {
Track(t) => Some(TrackInfo {
name: t.name.clone(),
artists: extract_artists_from_tracks(vec![t.clone().simplify()]),
duration: t.duration,
}),
Episode(_e) => None,
})
})
.collect(),
}), }),
Err(_e) => None, Err(_e) => None,
} }