diff --git a/Cargo.lock b/Cargo.lock
index a7c9c3c..04ca592 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3010,6 +3010,7 @@ dependencies = [
"serde",
"serde_json",
"souvlaki",
+ "subsonic-api",
"sys-locale",
"tokio",
"winresource",
@@ -5009,6 +5010,19 @@ dependencies = [
"float-cmp",
]
+[[package]]
+name = "subsonic-api"
+version = "0.3.2"
+dependencies = [
+ "md-5",
+ "rand 0.9.5",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.21",
+ "tokio",
+]
+
[[package]]
name = "subtle"
version = "2.6.1"
diff --git a/Cargo.toml b/Cargo.toml
index 865bbd3..106251a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[workspace]
resolver = "3"
-members = ["crates/ym-api", "crates/musyx"]
+members = ["crates/ym-api", "crates/subsonic-api", "crates/musyx"]
[workspace.package]
version = "0.3.2"
diff --git a/crates/musyx/Cargo.toml b/crates/musyx/Cargo.toml
index 3e0da5e..15dfb6c 100644
--- a/crates/musyx/Cargo.toml
+++ b/crates/musyx/Cargo.toml
@@ -8,6 +8,7 @@ publish.workspace = true
[dependencies]
ym-api = { path = "../ym-api" }
+subsonic-api = { path = "../subsonic-api" }
iced = { version = "0.14.0", features = ["svg", "image", "tokio", "advanced", "qr_code", "lazy", "canvas"] }
keyring = "4.2.0"
rodio = { version = "0.23.0", default-features = false, features = ["playback", "mp3", "mp4", "flac"] }
diff --git a/crates/musyx/assets/icons/server.svg b/crates/musyx/assets/icons/server.svg
new file mode 100644
index 0000000..78dc3c3
--- /dev/null
+++ b/crates/musyx/assets/icons/server.svg
@@ -0,0 +1,18 @@
+
+
diff --git a/crates/musyx/src/app.rs b/crates/musyx/src/app.rs
index 679e068..0ca5f9f 100644
--- a/crates/musyx/src/app.rs
+++ b/crates/musyx/src/app.rs
@@ -15,12 +15,13 @@ use ym_api::{
PlaylistId, PlaylistSummary, Station, Track, WaveSettings, YmClient,
};
-use crate::covers::Covers;
+use crate::covers::{Covers, Fetcher};
use crate::player::{self, Audio, Effect, Player};
use crate::route::{Navigator, Route};
use crate::screens::browse::{self, Discover, HomeData};
use crate::screens::collection::{Library, Liked, Tab};
use crate::screens::search::{self, Search};
+use crate::screens::server::{self, ServerScreen};
use crate::screens::wave::WaveScreen;
use crate::screens::detail::{self, Page};
use crate::screens::{self, Loadable, sign_in};
@@ -63,6 +64,8 @@ pub struct App {
discover: Discover,
genre_playlists: HashMap>>,
wave: WaveScreen,
+ /// The user's own music server: its connection, lists and pages.
+ server: ServerScreen,
/// Drives the My Wave hero animation.
wave_phase: f32,
covers: Covers,
@@ -106,6 +109,7 @@ pub enum Message {
Navigate(Route),
Back,
Search(search::Msg),
+ Server(server::Msg),
ToggleDrawer(Panel),
CloseDrawer,
ShowNowPlaying(bool),
@@ -217,6 +221,7 @@ impl App {
discover: Discover::default(),
genre_playlists: HashMap::new(),
wave: WaveScreen::default(),
+ server: ServerScreen::default(),
wave_phase: 0.0,
covers: Covers::default(),
likes: LikedIds::default(),
@@ -259,6 +264,8 @@ impl App {
return (app, Task::batch([appearance, restore(), config.capture()]));
}
app.session = config.session();
+ // No keychain in snapshots: My server shows its connect form.
+ let _ = app.server.update(server::Msg::Restored(Ok(None)));
app.library.liked = Liked::loaded(config.sample_liked(), &Liked::NotLoaded);
app.pages.insert(Route::Album(1), Loadable::Loaded(config.sample_album()));
app.pages.insert(Route::Playlist(crate::snapshot::OWN_PLAYLIST), Loadable::Loaded(config.sample_playlist()));
@@ -275,7 +282,7 @@ impl App {
return (app, Task::batch([appearance, config.capture()]));
}
- (app, Task::batch([appearance, restore()]))
+ (app, Task::batch([appearance, restore(), ServerScreen::restore()]))
}
pub fn title(&self) -> String {
@@ -556,6 +563,19 @@ impl App {
}
return task;
}
+ Message::Server(msg) => {
+ let connected = matches!(msg, server::Msg::Checked(_, Ok(())));
+ if connected || matches!(msg, server::Msg::Disconnect) {
+ // Another server can use the same cover ids for other pictures.
+ self.covers.forget_server();
+ }
+ let task = self.server.update(msg);
+ let route = self.nav.current();
+ if connected && route.is_server() {
+ return Task::batch([task, self.on_enter(route)]);
+ }
+ return task;
+ }
Message::ToggleDrawer(panel) => {
self.drawer = if self.drawer == Some(panel) { None } else { Some(panel) };
self.lyric_line = None;
@@ -1001,8 +1021,13 @@ impl App {
}
Message::WaveTick => self.wave_phase = (self.wave_phase + 0.04) % 10_000.0,
Message::CoverWanted(url) => {
- let Some(client) = self.client().cloned() else { return Task::none() };
- return self.covers.want(url, &client);
+ let fetcher = if url.starts_with(ym_api::SUBSONIC_COVER_PREFIX) {
+ self.server.client().cloned().map(Fetcher::Server)
+ } else {
+ self.client().cloned().map(Fetcher::Yandex)
+ };
+ let Some(fetcher) = fetcher else { return Task::none() };
+ return self.covers.want(url, fetcher);
}
Message::CoverLoaded(url, bytes) => self.covers.loaded(url, bytes),
Message::CoversTick => self.covers.flush(),
@@ -1022,7 +1047,8 @@ impl App {
Shortcut::VolumeUp => to_player(player::Msg::SetVolume(self.player.volume + shortcuts::VOLUME_STEP)),
Shortcut::VolumeDown => to_player(player::Msg::SetVolume(self.player.volume - shortcuts::VOLUME_STEP)),
Shortcut::ToggleLike => {
- let Some(track) = self.player.track().cloned() else { return Task::none() };
+ // Only Yandex tracks have a heart.
+ let Some(track) = self.player.track().filter(|t| t.is_yandex()).cloned() else { return Task::none() };
let liked = self.library.liked.contains(&track.id);
Message::LikeTrack(track, !liked)
}
@@ -1171,6 +1197,9 @@ impl App {
// "Yours" comes from liked albums.
Task::batch([featured, self.load_tab(Tab::Albums)])
}
+ Route::Server | Route::ServerAlbum(_) | Route::ServerArtist(_) | Route::ServerPlaylist(_) => {
+ self.server.enter(route)
+ }
Route::Album(_) | Route::Artist(_) | Route::Playlist(_) => {
if self.pages.get(&route).is_some_and(|p| !p.needs_load()) {
return Task::none();
@@ -1315,6 +1344,7 @@ impl App {
wave: &self.wave,
wave_phase: self.wave_phase,
settings: &self.settings,
+ server: &self.server,
}))
.height(Fill)
.style(theme::scroll);
@@ -1355,28 +1385,28 @@ impl App {
.into()
}
- /// Runs the player's requests against the API.
+ /// Runs the player's requests against the API: Yandex's, or the music
+ /// server's for tracks from there.
fn run(&self, effects: Vec) -> Task {
- let Some(client) = self.client() else { return Task::none() };
+ let ym = self.client().cloned();
+ let server = self.server.client().cloned();
+ let quality = self.settings.quality;
Task::batch(effects.into_iter().map(|effect| match effect {
- Effect::Fetch { generation, track_id } => {
- let client = client.clone();
- let quality = self.settings.quality;
- Task::future(async move { fetch_audio(&client, &track_id, quality).await })
+ Effect::Fetch { generation, track } => {
+ Task::future(fetch_audio(ym.clone(), server.clone(), track, quality))
.map(move |result| Message::Player(player::Msg::Fetched { generation, result }))
}
- Effect::Prefetch { track_id } => {
- let client = client.clone();
- let quality = self.settings.quality;
+ Effect::Prefetch { track } => {
+ let (ym, server) = (ym.clone(), server.clone());
Task::future(async move {
- let result = fetch_audio(&client, &track_id, quality).await;
- (track_id, result)
+ let track_id = track.id.clone();
+ (track_id, fetch_audio(ym, server, track, quality).await)
})
.map(|(track_id, result)| Message::Player(player::Msg::Prefetched { track_id, result }))
}
Effect::SignedOut => Task::done(Message::SignOut),
Effect::WaveFetch { station, session_id, queue } => {
- let client = client.clone();
+ let Some(client) = ym.clone() else { return Task::none() };
// My Wave's settings ride along as seeds when a session starts.
let settings = (station == MY_WAVE).then(|| self.wave.shown()).flatten();
Task::future(async move {
@@ -1389,7 +1419,7 @@ impl App {
}
// Feedback and reports are fire-and-forget: a lost one only blunts recommendations.
Effect::WaveFeedback { session_id, event, batch_id } => {
- let client = client.clone();
+ let Some(client) = ym.clone() else { return Task::none() };
Task::future(async move {
if let Err(e) = client.wave_feedback(&session_id, &event, batch_id.as_deref()).await {
eprintln!("wave feedback {event:?} (batch {batch_id:?}): {e}");
@@ -1398,7 +1428,7 @@ impl App {
.discard()
}
Effect::Report(report) => {
- let client = client.clone();
+ let Some(client) = ym.clone() else { return Task::none() };
Task::future(async move {
if let Err(e) = client.report_play(&report).await {
eprintln!("play report: {e}");
@@ -1406,17 +1436,59 @@ impl App {
})
.discard()
}
+ Effect::NowPlaying(track) => scrobble(server.clone(), &track, false),
+ Effect::Scrobble(track) => scrobble(server.clone(), &track, true),
}))
}
}
-async fn fetch_audio(client: &YmClient, track_id: &str, quality: Quality) -> Result