Compare commits

..
3 Commits
Author SHA1 Message Date
Sweetbread 1f80b99e4e Take cover art from YT if possible 2026-01-16 18:51:06 +03:00
Sweetbread 3d6ba1ef09 Rename confusing var 2026-01-16 18:21:00 +03:00
Sweetbread 3530c755ce Replace Playing status with Listening 2026-01-16 18:21:00 +03:00
2 changed files with 64 additions and 20 deletions

No files matched your search

Generated
+6 -6
View File
@@ -5,11 +5,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1731533236,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1707711327, "lastModified": 1768395095,
"narHash": "sha256-JaiR0Er0Bx80CT5POOYR1I1tLM7VvC2/ny6mOmkoRQw=", "narHash": "sha256-ZhuYJbwbZT32QA95tSkXd9zXHcdZj90EzHpEXBMabaw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "01737456dfe4907fb5bdc8af39ac8c6d6b1fb551", "rev": "13868c071cc73a5e9f610c47d7bb08e5da64fdd5",
"type": "github" "type": "github"
}, },
"original": { "original": {
+58 -14
View File
@@ -4,7 +4,7 @@ use core::time;
use std::{collections::{HashMap, HashSet}, env, error::Error, thread}; use std::{collections::{HashMap, HashSet}, env, error::Error, thread};
use discord_presence::{ use discord_presence::{
models::ActivityType, models::{ActivityType, DisplayType},
Client, Event, Client, Event,
}; };
use dotenv::dotenv; use dotenv::dotenv;
@@ -57,18 +57,35 @@ fn main() -> Result<(), Box<dyn Error>> {
debug!("Cached cover failure"); debug!("Cached cover failure");
None None
} else { } else {
let url = lb.cover_art(&track, &artist, release_name.as_deref(), 0); let youtube_cover_url = metadata.additional_info.as_ref()
.and_then(|info| info.music_service_name.as_ref())
.filter(
|service|
["YouTube", "YouTube Music"].contains(&service.as_str())
)
.and_then(|_| metadata.additional_info.as_ref())
.and_then(|info| info.origin_url.as_ref())
.and_then(|url| extract_youtube_video_id(url))
.map(|video_id| format!(
"https://img.youtube.com/vi/{}/sddefault.jpg",
video_id
));
match url { if let Some(url) = youtube_cover_url {
Ok(a) => { cover_cache.insert(hash_key.clone(), url.clone());
cover_cache.insert(hash_key, a.clone()); Some(url)
Some(a) } else {
}, match lb.cover_art(&track, &artist, release_name.as_deref(), 0) {
Err(e) => { Ok(url) => {
error!("Error fetching cover_art: {}", e); cover_cache.insert(hash_key.clone(), url.clone());
cover_failure_cache.insert(hash_key); Some(url)
None },
}, Err(e) => {
error!("Error fetching cover_art: {}", e);
cover_failure_cache.insert(hash_key);
None
},
}
} }
}; };
@@ -76,13 +93,14 @@ fn main() -> Result<(), Box<dyn Error>> {
// TODO: Add buttons // TODO: Add buttons
let mut t = act let mut t = act
.activity_type(ActivityType::Listening) .activity_type(ActivityType::Listening)
.status_display(DisplayType::State)
.state(artist.clone()) .state(artist.clone())
.details(track.clone()); .details(track.clone());
if let Some(url) = cover_art { if let Some(cover_url) = cover_art {
t = t.assets(|ass| { t = t.assets(|ass| {
ass ass
.large_image(url) .large_image(cover_url)
.large_text(format!("{} - {}", &track, &artist)) .large_text(format!("{} - {}", &track, &artist))
}) })
} }
@@ -95,3 +113,29 @@ fn main() -> Result<(), Box<dyn Error>> {
thread::sleep(time::Duration::from_secs(15)); thread::sleep(time::Duration::from_secs(15));
} }
} }
fn extract_youtube_video_id(url: &str) -> Option<&str> {
let patterns = [
"youtube.com/watch?v=",
"youtu.be/",
"youtube.com/v/",
"youtube.com/embed/",
];
for pattern in patterns.iter() {
if let Some(pos) = url.find(pattern) {
let start = pos + pattern.len();
let end = url[start..]
.find(|c: char| !c.is_alphanumeric() && c != '_' && c != '-')
.map(|end_pos| start + end_pos)
.unwrap_or(url.len());
let video_id = &url[start..end];
if !video_id.is_empty() {
return Some(video_id);
}
}
}
None
}