diff --git a/Cargo.lock b/Cargo.lock
index a8021ff..ae04978 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6672,6 +6672,7 @@ checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5"
name = "ym-api"
version = "0.2.1"
dependencies = [
+ "reqwest",
"serde",
"serde_json",
"thiserror 2.0.21",
diff --git a/crates/musyx/examples/api_probe.rs b/crates/musyx/examples/api_probe.rs
index 6833caa..f4c7525 100644
--- a/crates/musyx/examples/api_probe.rs
+++ b/crates/musyx/examples/api_probe.rs
@@ -74,10 +74,10 @@ async fn main() {
if let Ok(found) = client.search("eminem without me", SearchKind::Tracks, 0).await {
for track in found.tracks.iter().take(2) {
println!("track {} {} lyrics_available={}", track.id, track.title, track.lyrics_available);
- match client.lyrics(&track.id).await {
+ match client.lyrics(track).await {
Ok(Some(l)) => println!(
- "lyrics {}: synced={} lines={} first_stamp={:?}",
- track.id, l.synced, l.lines.len(), l.lines.first().and_then(|x| x.at)
+ "lyrics {}: {:?} synced={} lines={} first_stamp={:?}",
+ track.id, l.source, l.synced, l.lines.len(), l.lines.first().and_then(|x| x.at)
),
Ok(None) => println!("lyrics {}: none", track.id),
Err(e) => println!("lyrics {}: ERROR {e}", track.id),
@@ -87,10 +87,10 @@ async fn main() {
if let Ok(chart) = client.chart().await {
for entry in chart.iter().take(3) {
println!("chart {} lyrics_available={}", entry.track.id, entry.track.lyrics_available);
- match client.lyrics(&entry.track.id).await {
+ match client.lyrics(&entry.track).await {
Ok(Some(l)) => println!(
- "lyrics {}: synced={} lines={} first_stamp={:?}",
- entry.track.id, l.synced, l.lines.len(), l.lines.first().and_then(|x| x.at)
+ "lyrics {}: {:?} synced={} lines={} first_stamp={:?}",
+ entry.track.id, l.source, l.synced, l.lines.len(), l.lines.first().and_then(|x| x.at)
),
Ok(None) => println!("lyrics {}: none", entry.track.id),
Err(e) => println!("lyrics {}: ERROR {e}", entry.track.id),
diff --git a/crates/musyx/src/app/edit.rs b/crates/musyx/src/app/edit.rs
index 75f8e40..7ad285f 100644
--- a/crates/musyx/src/app/edit.rs
+++ b/crates/musyx/src/app/edit.rs
@@ -275,11 +275,11 @@ impl App {
if self.drawer != Some(crate::widgets::drawer::Panel::Lyrics) || self.lyrics.contains_key(&track.id) {
return Task::none();
}
- let id = track.id.clone();
- self.lyrics.insert(id.clone(), Loadable::Loading);
+ let track = track.clone();
+ self.lyrics.insert(track.id.clone(), Loadable::Loading);
Task::future(async move {
- let result = client.lyrics(&id).await.map(|l| l.map(Arc::new));
- Message::LyricsLoaded(id, result)
+ let result = client.lyrics(&track).await.map(|l| l.map(Arc::new));
+ Message::LyricsLoaded(track.id, result)
})
}
diff --git a/crates/musyx/src/i18n/ru.rs b/crates/musyx/src/i18n/ru.rs
index 52e832c..857d5d8 100644
--- a/crates/musyx/src/i18n/ru.rs
+++ b/crates/musyx/src/i18n/ru.rs
@@ -274,12 +274,13 @@ pub fn get(english: &str) -> Option<&'static str> {
"Очередь пока пуста. Здесь появятся треки, которые вы включите, и те, что за ними."
}
"Play a track to see its lyrics." => "Включите трек, чтобы увидеть его текст.",
- "Yandex Music has no lyrics for this track." => "У Яндекс Музыки нет текста этого трека.",
+ "No lyrics for this track." => "У этого трека нет текста.",
"Couldn't load the lyrics. Check your connection and try again." => {
"Не удалось загрузить текст. Проверьте подключение и попробуйте ещё раз."
}
"Loading lyrics…" => "Загружаем текст…",
"Written by {}" => "Авторы: {}",
+ "Lyrics from LRCLIB" => "Текст из LRCLIB",
"No sound output found. Connect speakers or headphones and playback picks up." => {
"Не найдено устройство вывода звука. Подключите колонки или наушники, и воспроизведение продолжится."
}
diff --git a/crates/musyx/src/widgets/drawer.rs b/crates/musyx/src/widgets/drawer.rs
index 1e1f5d7..3a2ffac 100644
--- a/crates/musyx/src/widgets/drawer.rs
+++ b/crates/musyx/src/widgets/drawer.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
use std::time::Duration;
use iced::widget::{Column, button, column, container, row, scrollable, space};
-use ym_api::{Lyrics, Track};
+use ym_api::{Lyrics, LyricsSource, Track};
use iced::{Alignment, Element, Fill, Padding};
use crate::app::Message;
@@ -69,7 +69,7 @@ pub fn view<'a>(
(Panel::Lyrics, None) => note(t, tr("Play a track to see its lyrics.")),
(Panel::Lyrics, Some(_)) => match lyrics {
Some(Loadable::Loaded(Some(l))) => lyrics_view(t, l, player.position()),
- Some(Loadable::Loaded(None)) => note(t, tr("Yandex Music has no lyrics for this track.")),
+ Some(Loadable::Loaded(None)) => note(t, tr("No lyrics for this track.")),
Some(Loadable::Failed(_)) => column![
note(t, tr("Couldn't load the lyrics. Check your connection and try again.")),
container(
@@ -123,10 +123,14 @@ fn lyrics_view<'a>(t: &'static Tokens, l: &'a Lyrics, position: Duration) -> Ele
}
});
let mut list = Column::with_children(lines).spacing(2);
- if !l.writers.is_empty() {
+ let credit = match l.source {
+ LyricsSource::Lrclib => Some(tr("Lyrics from LRCLIB").to_owned()),
+ LyricsSource::Yandex if !l.writers.is_empty() => Some(trf("Written by {}", &[&l.writers.join(", ")])),
+ LyricsSource::Yandex => None,
+ };
+ if let Some(credit) = credit {
list = list.push(
- container(para(trf("Written by {}", &[&l.writers.join(", ")]), size::SMALL, t.muted))
- .padding(iced::Padding::default().top(18).left(8).right(8)),
+ container(para(credit, size::SMALL, t.muted)).padding(iced::Padding::default().top(18).left(8).right(8)),
);
}
scrollable(list.padding(Padding::default().left(10).right(10).bottom(18)))
diff --git a/crates/ym-api/Cargo.toml b/crates/ym-api/Cargo.toml
index fe7609d..db9c3e2 100644
--- a/crates/ym-api/Cargo.toml
+++ b/crates/ym-api/Cargo.toml
@@ -8,6 +8,8 @@ publish.workspace = true
[dependencies]
yamuse = "0.3.2"
+# Same major as yamuse, so LRCLIB calls share its client and TLS setup.
+reqwest = { version = "0.12", default-features = false }
serde = { version = "1", features = ["derive"] }
thiserror = "2"
serde_json = "1"
diff --git a/crates/ym-api/src/client.rs b/crates/ym-api/src/client.rs
index ae1e771..1f65527 100644
--- a/crates/ym-api/src/client.rs
+++ b/crates/ym-api/src/client.rs
@@ -695,8 +695,16 @@ impl YmClient {
// ---- Lyrics ----
- /// Synced lyrics when Yandex has them, else plain text; `None` when there are none.
- pub async fn lyrics(&self, track_id: &str) -> Result