Merge branch 'main' of ssh://git.cesium.pw:2335/niku/lfm-discord-presence

.env.sample

@@ -1,3 +1,3 @@
-DISCORD_APP_ID=
+DISCORD_APP_ID="906984497524903937"
-LASTFM_USERNAME=
+LASTFM_API_KEY="71e8ca3f186b0a68342577b4401658e4"
-LASTFM_API_KEY=
+LASTFM_USERNAME="strnophix"

README.md

@@ -1,2 +1,30 @@
 # lfm-discord-presence
-Discord RPC for LastFM
+Discord Rich Presence for LastFM.
+
+![](./assets/screenshot.png)
+
+## Dependencies
+- [Rust](https://www.rust-lang.org/)
+- [Just](https://github.com/casey/just)
+
+## Usage
+### Setup
+```bash
+git clone https://git.cesium.pw/niku/lfm-discord-presence.git
+cd lfm-discord-presence
+cp .env.sample .env
+```
+### Using systemd
+Install:
+```bash
+just install
+```
+Uninstall:
+```bash
+just uninstall
+```
+
+### Using cargo
+```bash
+cargo run <lastfm-username>
+```

justfile

@@ -1,6 +1,24 @@
 load-dotenv:
-    set -a; source .env; set +a
+    set -a; source ./.env; set +a
 
 build-release:
-    cross build --target x86_64-pc-windows-gnu --release
+    cargo build --target x86_64-unknown-linux-gnu --release
-    cross build --target x86_64-unknown-linux-gnu --release
+
+install:
+    just build-release
+    sudo cp ./target/x86_64-unknown-linux-gnu/release/lfm-discord-presence /usr/local/bin
+
+    mkdir -p ~/.config/systemd/user
+    cp ./systemd/lfm-discord-presence.service ~/.config/systemd/user
+    
+    sed -i "s/LASTFM_USERNAME/$LASTFM_USERNAME/g" ~/.config/systemd/user/lfm-discord-presence.service
+
+    systemctl enable --user lfm-discord-presence.service --now
+
+uninstall:
+    systemctl disable --user lfm-discord-presence.service --now
+    sudo rm /usr/local/bin/lfm-discord-presence
+
+reinstall:
+    just uninstall
+    just install

src/main.rs

@@ -1,6 +1,6 @@
-use chrono::{Duration, Local, Utc};
+use chrono::{Duration, Local};
 use discord_rich_presence::{
-    activity::{Activity, Assets, Button, Timestamps},
+    activity::{Activity, Assets, Button},
     DiscordIpc, DiscordIpcClient,
 };
 use std::{
@@ -13,19 +13,20 @@ use tokio::{
     sync::oneshot::{self, channel},
 };
 
+const DISCORD_APP_ID: &str = env!("DISCORD_APP_ID", "Missing DISCORD_APP_ID in env");
+const LFM_API_KEY: &str = env!("LASTFM_API_KEY", "Missing LASTFM_API_KEY in env");
+
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let discord_app_id = env::var("DISCORD_APP_ID").expect("Missing DISCORD_APP_ID in env");
-    let lfm_username = env::var("LASTFM_USERNAME").expect("Missing LASTFM_USERNAME in env");
-    let lfm_api_key = env::var("LASTFM_API_KEY").expect("Missing LASTFM_API_KEY in env");
-
     let (send_stop, mut recv_stop) = channel::<()>();
 
-    let mut lfm = lastfm_rs::Client::new(lfm_api_key.as_str());
+    let lfm_username = std::env::args()
+        .nth(1)
+        .expect("No LastFM username provided");
+    let mut lfm = lastfm_rs::Client::new(LFM_API_KEY);
 
     let _ipc_client = Arc::new(Mutex::new(
-        DiscordIpcClient::new(discord_app_id.as_str())
+        DiscordIpcClient::new(DISCORD_APP_ID).expect("failed to create Discord IPC-client"),
-            .expect("failed to create Discord IPC-client"),
     ));
     let _ipc_client2 = Arc::clone(&_ipc_client);
 
@@ -35,10 +36,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     tokio::spawn(async move {
         let user_url = format!("https://www.last.fm/user/{}", lfm_username);
-        let started_at = Utc::now();
+        while let Err(oneshot::error::TryRecvError::Empty) = recv_stop.try_recv() {
-        loop {
-            match recv_stop.try_recv() {
-                Err(oneshot::error::TryRecvError::Empty) => {
             let tracks_result = lfm
                 .recent_tracks(&lfm_username)
                 .await
@@ -50,28 +48,36 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 let last_track = &tracks.tracks[0];
                 match &last_track.attrs {
                     Some(_) => {
-                                let details =
+                        let details = format!("{} - {}", &last_track.artist.name, last_track.name);
-                                    format!("{} - {}", last_track.artist.name, last_track.name);
+
                         println!(
                             "{} Currently playing: {:#?}",
                             Local::now().format("%Y/%m/%d %H:%M:%S"),
                             details
                         );
-                                let state = format!("on {}", last_track.album.name);
+
+                        let album_name: String = if last_track.album.name.is_empty() {
+                            last_track.name.clone()
+                        } else {
+                            last_track.album.name.clone()
+                        };
+
+                        let album_art = if last_track.images[2].image_url.is_empty() {
+                            "https://lastfm.freetls.fastly.net/i/u/174s/2a96cbd8b46e442fc41c2b86b821562f.png"
+                        } else {
+                            last_track.images[2].image_url.as_str()
+                        };
+
+                        let state = format!("on {}", album_name);
+                        let assets = Assets::new().large_image(album_art).large_text(&details);
                         let activity = Activity::new()
-                                    .assets(
+                            .assets(assets)
-                                        Assets::new()
-                                            .large_image(last_track.images[2].image_url.as_str())
-                                            .large_text(&details),
-                                    )
                             .details(details.as_str())
                             .state(state.as_str())
-                                    .timestamps(Timestamps::new().start(started_at.timestamp()))
                             .buttons(vec![Button::new("Profile", &user_url)]);
 
                         let mut ipc_client = _ipc_client2.lock().unwrap();
                         ipc_client.set_activity(activity).unwrap();
-                                drop(ipc_client);
                     }
                     None => {
                         println!(
@@ -83,11 +89,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             }
             thread::sleep(Duration::seconds(5).to_std().unwrap());
         }
-                _ => {
-                    break;
-                }
-            }
-        }
     });
 
     match signal::ctrl_c().await {

systemd/lfm-discord-presence.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Discord Rich Presence for LastFM
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/local/bin/lfm-discord-presence LASTFM_USERNAME
+Restart=always
+
+[Install]
+WantedBy=multi-user.target