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

feat(spotify): add playlist support, add pre-commit checks

pull/1/head
Davide Polonio 2021-11-10 14:31:42 +01:00
parent 63eb891f91
commit 1cda3984d8
17 changed files with 173 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.dockerignore
View File

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

1
.gitignore vendored
View File

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

11
.idea/codeStyles/Project.xml Normal file
View File

@ -0,0 +1,11 @@
<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>

5
.idea/codeStyles/codeStyleConfig.xml Normal file
View File

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

6
.idea/google-java-format.xml Normal file
View File

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

5
.idea/misc.xml
View File

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

2
.idea/modules.xml
View File

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

2
.idea/runConfigurations.xml
View File

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

6
.idea/sbt.xml Normal file
View File

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

2
.idea/vcs.xml
View File

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

17
.pre-commit-config.yaml Normal file
View File

@ -0,0 +1,17 @@
# 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

4
Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "songlify"
version = "0.2.0"
version = "0.2.1"
edition = "2018"
# 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"
pretty_env_logger = "0.4.0"
tokio = { version = "1.8", features = ["rt-multi-thread", "macros"] }
aspotify = "0.7.0"
aspotify = "0.7.0"

2
Dockerfile
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 /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /usr/lib/x86_64-linux-gnu/
ENTRYPOINT /usr/bin/songlify
ENTRYPOINT /usr/bin/songlify

2
README.md
View File

@ -1,3 +1,3 @@
# 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.

2
songlify.iml
View File

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

58
src/main.rs
View File

@ -1,8 +1,9 @@
use teloxide::prelude::*;
use crate::spotify::TrackInfo;
use spotify::SpotifyKind::Track;
use crate::spotify::SpotifyKind::Album;
use crate::spotify::SpotifyKind::{Album, Playlist};
mod spotify;
@ -44,9 +45,10 @@ async fn main() {
Some(info) => {
let mut reply = format!(
"Album information:\n\
🎵 Album name name: {}\n\
🧑‍🎤 Artist(s): {}",
🎵 Album name: {}\n\
🧑‍🎤 {} artist(s): {}",
info.name,
info.artists.len(),
info.artists.join(", ")
);
if !info.genres.is_empty() {
@ -55,15 +57,34 @@ async fn main() {
.as_str(),
);
}
if !info.songs.is_empty() {
let songs = info
.songs
.iter()
.map(|x| x.name.clone() + "\n")
.collect::<String>();
reply.push_str(format!("\n🎶 Song(s): {}", songs).as_str());
}
Some(message.reply_to(reply).await?)
Some(
message
.reply_to(add_track_section(info.tracks, reply))
.await?,
)
}
None => None,
}
}
Playlist(id) => {
log::debug!("Parsing spotify playlist: {}", id);
let playlist_info =
spotify::get_spotify_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,
}
@ -78,3 +99,16 @@ async fn main() {
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
}

75
src/spotify/mod.rs
View File

@ -1,10 +1,12 @@
use std::time::Duration;
use aspotify::{Client, ClientCredentials};
use aspotify::PlaylistItemType::{Episode, Track};
use aspotify::{Client, ClientCredentials, TrackSimplified};
pub enum SpotifyKind {
Track(String),
Album(String),
Playlist(String),
}
fn get_id_in_url(url: &str) -> Option<&str> {
@ -29,6 +31,13 @@ pub fn get_spotify_entry(url: &str) -> Option<SpotifyKind> {
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;
}
@ -49,7 +58,13 @@ pub struct AlbumInfo {
pub(crate) name: String,
pub(crate) artists: Vec<String>,
pub(crate) genres: Vec<String>,
pub(crate) songs: Vec<TrackInfo>,
pub(crate) tracks: Vec<TrackInfo>,
}
pub struct PlaylistInfo {
pub(crate) name: String,
pub(crate) artists: Vec<String>,
pub(crate) tracks: Vec<TrackInfo>,
}
pub async fn get_spotify_track(spotify: Box<Client>, id: &String) -> Option<TrackInfo> {
@ -69,7 +84,61 @@ pub async fn get_spotify_album(spotify: Box<Client>, id: &String) -> Option<Albu
name: album.data.name,
artists: album.data.artists.iter().map(|x| x.name.clone()).collect(),
genres: album.data.genres,
songs: vec![], // TODO we could lookup songs and put them here!
tracks: album
.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,
}
}
fn extract_artists_from_tracks(tracks: Vec<TrackSimplified>) -> Vec<String> {
tracks
.iter()
.flat_map(|t| t.artists.iter().map(|a| a.name.clone()))
.collect()
}
pub async fn get_spotify_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,
}