chore(spotify): refactor spotify wrapper & function names

.dockerignore

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

.gitignore

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

.idea/codeStyles/Project.xml

@@ -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>

.idea/codeStyles/codeStyleConfig.xml

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

.idea/google-java-format.xml

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

.idea/misc.xml

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

.idea/modules.xml

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

.idea/runConfigurations.xml

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

.idea/sbt.xml

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

.idea/vcs.xml

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

.pre-commit-config.yaml

@@ -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

Cargo.toml

@@ -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"

Dockerfile

@@ -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

README.md

@@ -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.

songlify.iml

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

src/main.rs

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

src/spotify/mod.rs

@@ -1,10 +1,31 @@
 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),
+}
+
+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> {
@@ -14,7 +35,14 @@ fn get_id_in_url(url: &str) -> Option<&str> {
         .and_then(|x| x.split('?').next())
 }
 
-pub fn get_spotify_entry(url: &str) -> Option<SpotifyKind> {
+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 fn get_entry_kind(url: &str) -> Option<SpotifyKind> {
     if url.contains("https://open.spotify.com/track/") {
         let track_id = get_id_in_url(url);
         return match track_id {
@@ -29,30 +57,24 @@ 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;
 }
 
-pub fn get_spotify_client() -> Box<Client> {
+pub fn get_client() -> Box<Client> {
     let spotify_creds =
         ClientCredentials::from_env().expect("CLIENT_ID and CLIENT_SECRET not found.");
     let spotify_client = Box::new(Client::new(spotify_creds));
     spotify_client
 }
 
-pub struct TrackInfo {
+pub async fn get_track(spotify: Box<Client>, id: &String) -> Option<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 {
         Ok(track) => Some(TrackInfo {
             name: track.data.name,
@@ -63,13 +85,60 @@ pub async fn get_spotify_track(spotify: Box<Client>, id: &String) -> Option<Trac
     }
 }
 
-pub async fn get_spotify_album(spotify: Box<Client>, id: &String) -> Option<AlbumInfo> {
+pub async fn get_album(spotify: Box<Client>, id: &String) -> Option<AlbumInfo> {
     match spotify.albums().get_album(id.as_str(), None).await {
         Ok(album) => Some(AlbumInfo {
             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,
+    }
+}
+
+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,
     }