From 60156aba94edf04fe656829d8dc2a3c0dcad9eb4 Mon Sep 17 00:00:00 2001 From: Yuriy Panov Date: Thu, 15 Oct 2026 16:28:07 +0600 Subject: [PATCH] feat: media keys, device recovery, settings and a macOS app bundle - Media keys and Now Playing (souvlaki): title, artist, album, cover and position published on track and state changes; play/pause/toggle, next/previous and seeking from the OS controls - Audio engine reopens the default output when the device changes or disappears, reloading the current track at the same position; with no device it keeps looking and resumes when one appears. Underruns are ignored rather than treated as device loss - Settings screen: streaming quality (Best, Balanced <=192 kbps, Data saver <=128 kbps), appearance (system/light/dark), clear cover cache; quality, appearance and volume persist as JSON in the config folder - Bitrate cap chooses the best variant within it, or the smallest above - Lyrics failures get a retry button - App icon drawn by tool/make_icon.py; tool/bundle-macos.sh builds an ad-hoc signed Musyx.app (--install copies it to /Applications) - Release profile: thin LTO and stripped symbols --- Cargo.lock | 207 ++++++++++++++++++++++--- Cargo.toml | 4 + README.md | 17 +++ crates/musyx/Cargo.toml | 2 + crates/musyx/assets/icon/musyx.png | Bin 0 -> 69273 bytes crates/musyx/src/app.rs | 117 +++++++++++++- crates/musyx/src/covers.rs | 13 ++ crates/musyx/src/main.rs | 3 + crates/musyx/src/media.rs | 159 +++++++++++++++++++ crates/musyx/src/player/engine.rs | 218 +++++++++++++++++++++------ crates/musyx/src/player/mod.rs | 4 +- crates/musyx/src/screens/mod.rs | 10 +- crates/musyx/src/screens/settings.rs | 61 ++++++++ crates/musyx/src/store.rs | 131 ++++++++++++++++ crates/musyx/src/widgets/drawer.rs | 13 +- crates/ym-api/src/client.rs | 6 +- crates/ym-api/src/models.rs | 24 +-- tool/bundle-macos.sh | 60 ++++++++ tool/make_icon.py | 84 +++++++++++ 19 files changed, 1039 insertions(+), 94 deletions(-) create mode 100644 crates/musyx/assets/icon/musyx.png create mode 100644 crates/musyx/src/media.rs create mode 100644 crates/musyx/src/screens/settings.rs create mode 100644 crates/musyx/src/store.rs create mode 100755 tool/bundle-macos.sh create mode 100755 tool/make_icon.py diff --git a/Cargo.lock b/Cargo.lock index e9b19d5..6a6c61a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -740,6 +740,36 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a" +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation 0.9.4", + "core-graphics 0.22.3", + "foreign-types 0.3.2", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "libc", + "objc", +] + [[package]] name = "codespan-reporting" version = "0.12.0" @@ -808,6 +838,19 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "foreign-types 0.3.2", + "libc", +] + [[package]] name = "core-graphics" version = "0.23.2" @@ -817,7 +860,7 @@ dependencies = [ "bitflags 1.3.2", "core-foundation 0.9.4", "core-graphics-types 0.1.3", - "foreign-types", + "foreign-types 0.5.0", "libc", ] @@ -1067,6 +1110,26 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376" +[[package]] +name = "dbus" +version = "0.9.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab69f03cc8c4340c9c8e315114e1658e6775a9b16a04357973aa21cec22b32e" +dependencies = [ + "libc", + "libdbus-sys", + "windows-sys 0.61.2", +] + +[[package]] +name = "dbus-crossroads" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64bff0bd181fba667660276c6b7ebdc50cff37ce593e7adf9e734f89c8f444e8" +dependencies = [ + "dbus", +] + [[package]] name = "digest" version = "0.10.7" @@ -1428,6 +1491,15 @@ dependencies = [ "ttf-parser", ] +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + [[package]] name = "foreign-types" version = "0.5.0" @@ -1435,7 +1507,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" dependencies = [ "foreign-types-macros", - "foreign-types-shared", + "foreign-types-shared 0.3.1", ] [[package]] @@ -1449,6 +1521,12 @@ dependencies = [ "syn 3.0.9", ] +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "foreign-types-shared" version = "0.3.1" @@ -2586,6 +2664,15 @@ version = "0.2.190" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce5d3ddc6d3fa000eb1536d85e147bfe31aacaba692ed6a876f95cb7c855be78" +[[package]] +name = "libdbus-sys" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "328c4789d42200f1eeec05bd86c9c13c7f091d2ba9a6ea35acdf51f31bc0f043" +dependencies = [ + "pkg-config", +] + [[package]] name = "libfuzzer-sys" version = "0.4.13" @@ -2819,7 +2906,7 @@ dependencies = [ "bitflags 2.13.2", "block", "core-graphics-types 0.2.0", - "foreign-types", + "foreign-types 0.5.0", "log", "objc", "paste", @@ -2915,7 +3002,9 @@ dependencies = [ "png 0.18.1", "rand 0.9.5", "rodio", + "serde", "serde_json", + "souvlaki", "tokio", "ym-api", ] @@ -4856,6 +4945,24 @@ dependencies = [ "x11rb", ] +[[package]] +name = "souvlaki" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5855c8f31521af07d896b852eaa9eca974ddd3211fc2ae292e58dda8eb129bc8" +dependencies = [ + "base64 0.22.1", + "block", + "cocoa", + "core-graphics 0.22.3", + "dbus", + "dbus-crossroads", + "dispatch", + "objc", + "thiserror 1.0.69", + "windows 0.44.0", +] + [[package]] name = "spirv" version = "0.3.0+sdk-1.3.268.0" @@ -5988,6 +6095,15 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "windows" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +dependencies = [ + "windows-targets 0.42.2", +] + [[package]] name = "windows" version = "0.58.0" @@ -5995,7 +6111,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" dependencies = [ "windows-core 0.58.0", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -6029,7 +6145,7 @@ dependencies = [ "windows-interface 0.58.0", "windows-result 0.2.0", "windows-strings 0.1.0", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -6135,7 +6251,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -6154,7 +6270,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ "windows-result 0.2.0", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -6172,7 +6288,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -6181,7 +6297,7 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -6193,20 +6309,35 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-targets" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -6218,18 +6349,36 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -6242,24 +6391,48 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -6282,7 +6455,7 @@ dependencies = [ "cfg_aliases", "concurrent-queue", "core-foundation 0.9.4", - "core-graphics", + "core-graphics 0.23.2", "cursor-icon", "dpi", "js-sys", diff --git a/Cargo.toml b/Cargo.toml index 7254b3d..cbf4a39 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,3 +10,7 @@ publish = false [workspace.lints.clippy] all = { level = "warn", priority = -1 } + +[profile.release] +lto = "thin" +strip = true diff --git a/README.md b/README.md index 44f2ac3..844894c 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,23 @@ Sign-in uses the public OAuth client id of the official Android app (through third-party apps. On macOS an unsigned dev build may ask for keychain access again after each rebuild, because the keychain ties access to the binary's signature. +## Install on macOS + +```sh +tool/bundle-macos.sh --install +``` + +This builds a release `Musyx.app` (ad-hoc signed) into `target/release/bundle/`. With +`--install`, it also copies the app to `/Applications`. The icon comes from +`crates/musyx/assets/icon/musyx.png`, which `tool/make_icon.py` draws. Each new build is a new +code identity to the keychain, so macOS asks once to allow access to the saved sign-in. + +## Settings + +Settings (streaming quality, appearance, volume) are kept in +`~/Library/Application Support/Musyx/settings.json`. Covers are cached under +`~/Library/Caches/Musyx/covers` and can be cleared from Settings. + ## Check ```sh diff --git a/crates/musyx/Cargo.toml b/crates/musyx/Cargo.toml index e0d0037..323524d 100644 --- a/crates/musyx/Cargo.toml +++ b/crates/musyx/Cargo.toml @@ -14,6 +14,8 @@ rodio = { version = "0.23.0", default-features = false, features = ["playback", rand = "0.9" open = "5.4.4" serde_json = "1" +serde = { version = "1", features = ["derive"] } +souvlaki = "0.8.3" tokio = { version = "1", features = ["time", "rt", "fs", "sync"] } directories = "6.0.0" png = { version = "0.18.1", optional = true } diff --git a/crates/musyx/assets/icon/musyx.png b/crates/musyx/assets/icon/musyx.png new file mode 100644 index 0000000000000000000000000000000000000000..99008dfda66457af43dda7d71c44b9d077015b96 GIT binary patch literal 69273 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 %$? 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%0A$umxqstV4j(P$xUoK-Y5U!*9nsIH! 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 TNzvMfN?PZp?u|lC%NPF-R#ix$ literal 0 HcmV?d00001 diff --git a/crates/musyx/src/app.rs b/crates/musyx/src/app.rs index 974d808..8cbbede 100644 --- a/crates/musyx/src/app.rs +++ b/crates/musyx/src/app.rs @@ -24,6 +24,7 @@ use crate::screens::wave::WaveScreen; use crate::screens::detail::{self, Page}; use crate::screens::{self, Loadable, sign_in}; use crate::session::{self, Restored}; +use crate::store::{self, Appearance, Quality, Settings}; use crate::ui::theme::{self, shell}; use crate::widgets::drawer::{self, Panel}; use crate::widgets::player_bar; @@ -70,6 +71,13 @@ pub struct App { lyric_line: Option, /// The queue published to Yandex for the list playing now. server_queue: Option, + settings: Settings, + /// The OS appearance, used when settings say "Match system". + system_mode: Mode, + /// Volume changed and not yet saved; saved once the slider settles. + settings_dirty: Option, + /// Media keys and the system's Now Playing widget. + media: crate::media::Media, /// A live snapshot run opens this route once signed in. #[cfg(feature = "snapshot")] snapshot_route: Option, @@ -114,6 +122,13 @@ pub enum Message { SetWaveSettings(WaveSettings), WaveSettingsSaved(WaveSettings, Result<(), Error>), WaveTick, + SetQuality(Quality), + SetAppearance(Appearance), + SaveSettings, + SettingsSaved(Result<(), String>), + ClearCoverCache, + CoverCacheCleared(Result<(), String>), + Media(crate::media::Command), LoadLikedIds, LikedIdsLoaded(Result), LikeTrack(Track, bool), @@ -137,6 +152,7 @@ pub enum Message { MovePlaylistTrack { id: PlaylistId, track: Track, from: usize, to: usize }, Edited(Box), LyricsLoaded(String, Result>, Error>), + RetryLyrics, QueueCreated(Result, Error>), ToastTick, CoverWanted(String), @@ -167,9 +183,18 @@ impl App { lyrics: HashMap::new(), lyric_line: None, server_queue: None, + settings: Settings::default(), + system_mode: Mode::Dark, + settings_dirty: None, + media: crate::media::Media::new(), #[cfg(feature = "snapshot")] snapshot_route: None, }; + let mut app = app; + app.settings = store::load(); + app.player.volume = app.settings.volume; + app.apply_theme(); + let app = app; let appearance = iced::system::theme().map(Message::ThemeChanged); #[cfg(feature = "snapshot")] @@ -209,10 +234,21 @@ impl App { self.theme.clone() } + /// Snapshot override, then the user's choice, then the system appearance. + fn apply_theme(&mut self) { + let mode = self.forced_mode.unwrap_or(match self.settings.appearance { + Appearance::System => self.system_mode, + Appearance::Light => Mode::Light, + Appearance::Dark => Mode::Dark, + }); + self.theme = theme::for_mode(mode); + } + pub fn subscription(&self) -> Subscription { let appearance = iced::system::theme_changes().map(Message::ThemeChanged); let audio = player::engine::subscription().map(|e| Message::Player(player::Msg::Engine(e))); - let mut subs = vec![appearance, audio]; + let keys = crate::media::subscription().map(Message::Media); + let mut subs = vec![appearance, audio, keys]; if let Session::SignedOut(sign_in) = &self.session { subs.push(sign_in.subscription().map(Message::SignIn)); } @@ -223,6 +259,9 @@ impl App { if hero_visible && wave_playing && matches!(self.session, Session::SignedIn { .. }) { subs.push(iced::time::every(std::time::Duration::from_millis(33)).map(|_| Message::WaveTick)); } + if self.settings_dirty.is_some() { + subs.push(iced::time::every(std::time::Duration::from_millis(500)).map(|_| Message::SaveSettings)); + } if self.toast.is_some() { subs.push(iced::time::every(std::time::Duration::from_millis(500)).map(|_| Message::ToastTick)); } @@ -283,7 +322,40 @@ impl App { fn update_inner(&mut self, message: Message) -> Task { match message { Message::ThemeChanged(mode) => { - self.theme = theme::for_mode(self.forced_mode.unwrap_or(mode)); + self.system_mode = mode; + self.apply_theme(); + } + Message::SetQuality(quality) => { + self.settings.quality = quality; + self.toast(format!("Streaming quality: {}. Applies from the next track.", quality.label())); + return self.update(Message::SaveSettings); + } + Message::SetAppearance(appearance) => { + self.settings.appearance = appearance; + self.apply_theme(); + return self.update(Message::SaveSettings); + } + Message::SaveSettings => { + // Wait for the volume slider to settle before writing. + if self.settings_dirty.is_some_and(|at| at.elapsed() < std::time::Duration::from_millis(800)) { + return Task::none(); + } + self.settings_dirty = None; + return Task::future(store::save(self.settings)).map(Message::SettingsSaved); + } + Message::SettingsSaved(result) => { + if let Err(e) = result { + eprintln!("settings: {e}"); + self.toast("Couldn't save your settings. They'll apply until Musyx quits."); + } + } + Message::ClearCoverCache => { + return self.covers.clear_disk().map(Message::CoverCacheCleared); + } + Message::CoverCacheCleared(Ok(())) => self.toast("Cover cache cleared"), + Message::CoverCacheCleared(Err(e)) => { + eprintln!("clear covers: {e}"); + self.toast("Couldn't clear the cover cache."); } Message::Restore => { self.session = Session::Restoring; @@ -379,7 +451,13 @@ impl App { Message::CloseDrawer => self.drawer = None, Message::Player(msg) => { let before = self.player.track().map(|t| t.id.clone()); + let seeked = matches!(msg, player::Msg::Seek(_) | player::Msg::SeekCommit); let effects = self.player.update(msg); + self.media.update(self.player.track(), self.player.status(), self.player.position(), seeked); + if self.player.volume != self.settings.volume { + self.settings.volume = self.player.volume; + self.settings_dirty = Some(std::time::Instant::now()); + } let run = self.run(effects); if self.player.track().map(|t| t.id.as_str()) != before.as_deref() { self.lyric_line = None; @@ -396,6 +474,24 @@ impl App { self.toast(format!("“{}” plays next", track.full_title())); return self.update(Message::Player(player::Msg::PlayNext(track))); } + Message::Media(command) => { + use crate::media::Command as C; + let status = self.player.status(); + let msg = match command { + C::Play if status != player::Status::Playing => player::Msg::Toggle, + C::Pause if status == player::Status::Playing => player::Msg::Toggle, + C::Play | C::Pause => return Task::none(), + C::Toggle => player::Msg::Toggle, + C::Next => player::Msg::Next, + C::Previous => player::Msg::Previous, + C::SeekTo(at) => player::Msg::Seek(at), + C::SeekBy { forward, by } => { + let now = self.player.position(); + player::Msg::Seek(if forward { now + by } else { now.saturating_sub(by) }) + } + }; + return self.update(Message::Player(msg)); + } Message::SkipFromMenu => { self.sheet = None; return self.update(Message::Player(player::Msg::Next)); @@ -436,6 +532,12 @@ impl App { } self.lyrics.insert(id, Loadable::from_result(result)); } + Message::RetryLyrics => { + if let Some(id) = self.player.track().map(|t| t.id.clone()) { + self.lyrics.remove(&id); + } + return self.want_lyrics(); + } Message::QueueCreated(Ok(id)) => self.server_queue = id, Message::QueueCreated(Err(e)) => { eprintln!("publish queue: {e}"); @@ -784,6 +886,7 @@ impl App { player: &self.player, wave: &self.wave, wave_phase: self.wave_phase, + settings: &self.settings, })) .height(Fill) .style(theme::scroll); @@ -859,13 +962,15 @@ impl App { Task::batch(effects.into_iter().map(|effect| match effect { Effect::Fetch { generation, track_id } => { let client = client.clone(); - Task::future(async move { fetch_audio(&client, &track_id).await }) + let cap = self.settings.quality.max_kbps(); + Task::future(async move { fetch_audio(&client, &track_id, cap).await }) .map(move |result| Message::Player(player::Msg::Fetched { generation, result })) } Effect::Prefetch { track_id } => { let client = client.clone(); + let cap = self.settings.quality.max_kbps(); Task::future(async move { - let result = fetch_audio(&client, &track_id).await; + let result = fetch_audio(&client, &track_id, cap).await; (track_id, result) }) .map(|(track_id, result)| Message::Player(player::Msg::Prefetched { track_id, result })) @@ -919,8 +1024,8 @@ impl App { } } -async fn fetch_audio(client: &YmClient, track_id: &str) -> Result { - let stream = client.stream(track_id).await?; +async fn fetch_audio(client: &YmClient, track_id: &str, max_kbps: Option) -> Result { + let stream = client.stream(track_id, max_kbps).await?; let bytes = client.fetch(&stream).await?; Ok(Audio { stream, bytes }) } diff --git a/crates/musyx/src/covers.rs b/crates/musyx/src/covers.rs index 875ed1b..fd4307d 100644 --- a/crates/musyx/src/covers.rs +++ b/crates/musyx/src/covers.rs @@ -84,6 +84,19 @@ impl Covers { }) } + /// Deletes the on-disk cache and forgets failures; images in memory stay for this session. + pub fn clear_disk(&mut self) -> Task> { + self.failed.clear(); + let Some(dir) = self.dir.clone() else { return Task::done(Ok(())) }; + Task::future(async move { + match tokio::fs::remove_dir_all(&dir).await { + Ok(()) => Ok(()), + Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(()), + Err(e) => Err(e.to_string()), + } + }) + } + pub fn loaded(&mut self, url: String, bytes: Option>) { self.pending.remove(&url); match bytes { diff --git a/crates/musyx/src/main.rs b/crates/musyx/src/main.rs index b80321d..c50e5cc 100644 --- a/crates/musyx/src/main.rs +++ b/crates/musyx/src/main.rs @@ -1,9 +1,11 @@ mod app; mod covers; +mod media; mod player; mod route; mod screens; mod session; +mod store; #[cfg(feature = "snapshot")] mod snapshot; mod ui; @@ -23,6 +25,7 @@ fn main() -> iced::Result { .window(window::Settings { size: Size::new(1280.0, 800.0), min_size: Some(Size::new(960.0, 620.0)), + icon: window::icon::from_file_data(include_bytes!("../assets/icon/musyx.png"), None).ok(), ..window::Settings::default() }) .centered(); diff --git a/crates/musyx/src/media.rs b/crates/musyx/src/media.rs new file mode 100644 index 0000000..bc14672 --- /dev/null +++ b/crates/musyx/src/media.rs @@ -0,0 +1,159 @@ +//! Media keys and the system's Now Playing widget (macOS Control Center, +//! Windows media overlay, Linux MPRIS), through `souvlaki`. + +use std::sync::Mutex; +use std::time::Duration; + +use iced::Subscription; +use iced::futures::{SinkExt, Stream}; +use souvlaki::{MediaControlEvent, MediaControls, MediaMetadata, MediaPlayback, MediaPosition, PlatformConfig}; +use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender, unbounded_channel}; +use ym_api::Track; + +use crate::covers; +use crate::player::Status; + +/// What the media keys asked for, in player terms. +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum Command { + Play, + Pause, + Toggle, + Next, + Previous, + SeekTo(Duration), + SeekBy { forward: bool, by: Duration }, +} + +/// Without an amount, a seek key jumps this far. +const SEEK_STEP: Duration = Duration::from_secs(10); + +impl Command { + fn from_event(event: MediaControlEvent) -> Option { + use souvlaki::SeekDirection::Forward; + Some(match event { + MediaControlEvent::Play => Command::Play, + MediaControlEvent::Pause | MediaControlEvent::Stop => Command::Pause, + MediaControlEvent::Toggle => Command::Toggle, + MediaControlEvent::Next => Command::Next, + MediaControlEvent::Previous => Command::Previous, + MediaControlEvent::SetPosition(MediaPosition(at)) => Command::SeekTo(at), + MediaControlEvent::Seek(dir) => Command::SeekBy { forward: dir == Forward, by: SEEK_STEP }, + MediaControlEvent::SeekBy(dir, by) => Command::SeekBy { forward: dir == Forward, by }, + _ => return None, + }) + } +} + +/// The OS calls back on its own thread; this hands commands to the subscription. +static INBOX: Mutex>> = Mutex::new(None); + +/// Owns the OS integration. Created on the main thread at startup. +pub struct Media { + controls: Option, + /// What was last published, so unchanged state isn't sent again. + shown: Option<(String, Status)>, +} + +impl Media { + pub fn new() -> Self { + let (tx, rx): (UnboundedSender, _) = unbounded_channel(); + let controls = MediaControls::new(PlatformConfig { display_name: "Musyx", dbus_name: "musyx", hwnd: None }) + .and_then(|mut c| { + c.attach(move |event| { + if let Some(command) = Command::from_event(event) { + let _ = tx.send(command); + } + })?; + Ok(c) + }); + match controls { + Ok(c) => { + if let Ok(mut inbox) = INBOX.lock() { + *inbox = Some(rx); + } + Self { controls: Some(c), shown: None } + } + Err(e) => { + eprintln!("media controls unavailable: {e:?}"); + Self { controls: None, shown: None } + } + } + } + + /// Publishes the track and play state; `force` resends the position after a seek. + pub fn update(&mut self, track: Option<&Track>, status: Status, position: Duration, force: bool) { + let Some(controls) = &mut self.controls else { return }; + let Some(track) = track else { + if self.shown.take().is_some() { + let _ = controls.set_playback(MediaPlayback::Stopped); + } + return; + }; + let new_track = self.shown.as_ref().is_none_or(|(id, _)| *id != track.id); + let new_status = self.shown.as_ref().is_none_or(|(_, s)| *s != status); + if !new_track && !new_status && !force { + return; + } + if new_track { + let title = track.full_title(); + let artist = track.artist_line(); + let album = track.album.as_ref().map(|a| a.title.clone()); + let cover = track.cover_url(covers::LARGE); + let _ = controls.set_metadata(MediaMetadata { + title: Some(&title), + artist: Some(&artist), + album: album.as_deref(), + cover_url: cover.as_deref(), + duration: Some(track.duration), + }); + } + let progress = Some(MediaPosition(position)); + let _ = controls.set_playback(match status { + Status::Playing | Status::Loading => MediaPlayback::Playing { progress }, + Status::Paused | Status::Ended => MediaPlayback::Paused { progress }, + }); + self.shown = Some((track.id.clone(), status)); + } +} + +pub fn subscription() -> Subscription { + Subscription::run(commands) +} + +fn commands() -> impl Stream { + iced::stream::channel(16, async |mut output| { + let inbox = INBOX.lock().ok().and_then(|mut i| i.take()); + let Some(mut inbox) = inbox else { + // No OS integration: stay pending rather than ending the subscription. + std::future::pending::<()>().await; + return; + }; + while let Some(command) = inbox.recv().await { + if output.send(command).await.is_err() { + break; + } + } + }) +} + +#[cfg(test)] +mod tests { + use super::*; + use souvlaki::SeekDirection; + + #[test] + fn os_events_map_to_player_commands() { + assert_eq!(Command::from_event(MediaControlEvent::Toggle), Some(Command::Toggle)); + assert_eq!(Command::from_event(MediaControlEvent::Stop), Some(Command::Pause)); + assert_eq!( + Command::from_event(MediaControlEvent::SetPosition(MediaPosition(Duration::from_secs(42)))), + Some(Command::SeekTo(Duration::from_secs(42))) + ); + assert_eq!( + Command::from_event(MediaControlEvent::Seek(SeekDirection::Backward)), + Some(Command::SeekBy { forward: false, by: SEEK_STEP }) + ); + assert_eq!(Command::from_event(MediaControlEvent::Raise), None); + } +} diff --git a/crates/musyx/src/player/engine.rs b/crates/musyx/src/player/engine.rs index 8fa2561..569214b 100644 --- a/crates/musyx/src/player/engine.rs +++ b/crates/musyx/src/player/engine.rs @@ -8,7 +8,7 @@ use std::io::Cursor; use std::sync::Arc; use std::sync::mpsc::{self, RecvTimeoutError}; -use std::time::Duration; +use std::time::{Duration, Instant}; use iced::Subscription; use iced::futures::{SinkExt, Stream}; @@ -24,6 +24,8 @@ pub enum Command { Seek(Duration), Volume(f32), Stop, + /// The output device failed or changed; sent by the audio stream's error callback. + Reopen, } /// A cheap handle the UI keeps to send commands. @@ -51,8 +53,10 @@ pub enum Event { Ended { generation: u64 }, /// The bytes didn't decode (corrupt download, unsupported codec). DecodeFailed { generation: u64, reason: String }, - /// No output device, or it went away. + /// No output device, or it went away. Musyx keeps trying to reopen one. NoOutput(String), + /// Sound is going to a device again after [`Event::NoOutput`]. + OutputReady, } pub fn subscription() -> Subscription { @@ -63,9 +67,10 @@ fn events() -> impl Stream { iced::stream::channel(64, async |mut output| { let (commands, inbox) = mpsc::channel(); let (events, mut outbox) = tokio::sync::mpsc::unbounded_channel(); + let own = commands.clone(); std::thread::Builder::new() .name("musyx-audio".into()) - .spawn(move || run(inbox, events)) + .spawn(move || run(inbox, own, events)) .expect("spawn audio thread"); let _ = output.send(Event::Ready(Handle(commands))).await; @@ -83,7 +88,7 @@ fn events() -> impl Stream { /// 44.1 kHz), which Bluetooth headphones that cap at 1024 frames reject, and its /// fallback then filters out every macOS device. So pick the buffer here, /// clamped to what the device says it supports. -fn open_output() -> Result { +fn open_output(on_error: impl FnMut(rodio::cpal::Error) + Send + Clone + 'static) -> Result { use rodio::cpal::traits::{DeviceTrait, HostTrait}; use rodio::cpal::{BufferSize, SupportedBufferSize}; @@ -101,6 +106,7 @@ fn open_output() -> Result { .with_device(device) .with_supported_config(&config) .with_buffer_size(buffer) + .with_error_callback(on_error) .open_stream() .or_else(|first| DeviceSinkBuilder::open_default_sink().map_err(|_| first.to_string())) } @@ -110,97 +116,211 @@ fn buffer_frames(sample_rate: u32, min: u32, max: u32) -> u32 { (sample_rate / 20).next_power_of_two().clamp(min, max.max(min)) } -fn run(inbox: mpsc::Receiver, events: tokio::sync::mpsc::UnboundedSender) { +/// An open device and the player feeding it. The sink must outlive the player: +/// dropping it silences everything. +struct Output { + _sink: MixerDeviceSink, + player: Player, +} + +/// The track loaded now, kept so it can be reloaded on a new device. +struct Current { + generation: u64, + bytes: Arc<[u8]>, + hint: String, +} + +/// Wait after a device change before reopening; macOS needs a moment to settle. +const SETTLE: Duration = Duration::from_millis(400); +/// How often to look for a device when there is none. +const RETRY: Duration = Duration::from_secs(3); + +fn open(commands: &mpsc::Sender) -> Result { + let tx = commands.clone(); + let on_error = move |e: rodio::cpal::Error| { + use rodio::cpal::ErrorKind; + // Underruns are momentary glitches; only a lost or switched device needs a new stream. + if matches!(e.kind(), ErrorKind::DeviceChanged | ErrorKind::DeviceNotAvailable) { + let _ = tx.send(Command::Reopen); + } else if !matches!(e.kind(), ErrorKind::Xrun) { + eprintln!("audio stream error: {e}"); + } + }; + let mut sink = open_output(on_error)?; + sink.log_on_drop(false); + let player = Player::connect_new(sink.mixer()); + Ok(Output { _sink: sink, player }) +} + +fn decode(current: &Current) -> Result>>, String> { + let len = current.bytes.len() as u64; + Decoder::builder() + .with_data(Cursor::new(current.bytes.clone())) + .with_byte_len(len) + .with_hint(¤t.hint) + .with_seekable(true) + .with_gapless(true) + .build() + .map_err(|e| e.to_string()) +} + +fn run(inbox: mpsc::Receiver, commands: mpsc::Sender, events: tokio::sync::mpsc::UnboundedSender) { let emit = |e: Event| { let _ = events.send(e); }; - // The device sink must outlive the player: dropping it silences everything. - let sink = match open_output() { - Ok(mut sink) => { - sink.log_on_drop(false); - sink - } + let mut output = match open(&commands) { + Ok(o) => Some(o), Err(e) => { emit(Event::NoOutput(e)); - // Keep draining so senders never block or error; nothing can play. - while inbox.recv().is_ok() {} - return; + None } }; - let player = Player::connect_new(sink.mixer()); - - let mut loaded: Option = None; + let mut volume = 1.0_f32; + let mut playing = false; + let mut current: Option = None; let mut ended_sent = false; let mut last_reported = None; + let mut last_attempt = Instant::now(); loop { match inbox.recv_timeout(TICK) { Ok(Command::Load { generation, bytes, hint, play }) => { - player.clear(); - let len = bytes.len() as u64; - let decoder = Decoder::builder() - .with_data(Cursor::new(bytes)) - .with_byte_len(len) - .with_hint(&hint) - .with_seekable(true) - .with_gapless(true) - .build(); - match decoder { + let next = Current { generation, bytes, hint }; + match decode(&next) { Ok(source) => { let duration = source.total_duration(); - player.append(source); - if play { - player.play(); + if let Some(o) = &output { + o.player.clear(); + o.player.append(source); + if play { + o.player.play(); + } } - loaded = Some(generation); + playing = play; + current = Some(next); ended_sent = false; last_reported = None; emit(Event::Loaded { generation, duration }); } - Err(e) => { - loaded = None; - emit(Event::DecodeFailed { generation, reason: e.to_string() }); + Err(reason) => { + current = None; + emit(Event::DecodeFailed { generation, reason }); } } } - Ok(Command::Play) => player.play(), - Ok(Command::Pause) => player.pause(), + Ok(Command::Play) => { + playing = true; + if let Some(o) = &output { + o.player.play(); + } + } + Ok(Command::Pause) => { + playing = false; + if let Some(o) = &output { + o.player.pause(); + } + } Ok(Command::Seek(to)) => { - if let Some(generation) = loaded { + if let (Some(o), Some(c)) = (&output, ¤t) // A failed seek leaves playback where it was; the next tick reports that. - if player.try_seek(to).is_ok() { - emit(Event::Position { generation, position: player.get_pos() }); - } + && o.player.try_seek(to).is_ok() + { + emit(Event::Position { generation: c.generation, position: o.player.get_pos() }); + } + } + Ok(Command::Volume(v)) => { + volume = v.clamp(0.0, 1.0); + if let Some(o) = &output { + o.player.set_volume(volume); } } - Ok(Command::Volume(v)) => player.set_volume(v.clamp(0.0, 1.0)), Ok(Command::Stop) => { - player.clear(); - loaded = None; + if let Some(o) = &output { + o.player.clear(); + } + current = None; + playing = false; + } + Ok(Command::Reopen) => { + // Several errors arrive per change; one reopen covers them all. + while let Ok(Command::Reopen) = inbox.try_recv() {} + if last_attempt.elapsed() >= SETTLE { + std::thread::sleep(SETTLE); + while let Ok(Command::Reopen) = inbox.try_recv() {} + output = reopen(output.take(), &commands, ¤t, volume, playing, &emit); + last_attempt = Instant::now(); + } } Err(RecvTimeoutError::Timeout) => {} Err(RecvTimeoutError::Disconnected) => break, } - let Some(generation) = loaded else { continue }; - if player.empty() { + // No device yet: look again now and then (headphones plugged in later). + if output.is_none() && last_attempt.elapsed() >= RETRY { + last_attempt = Instant::now(); + output = reopen(None, &commands, ¤t, volume, playing, &emit); + } + + let (Some(o), Some(c)) = (&output, ¤t) else { continue }; + if o.player.empty() { if !ended_sent { ended_sent = true; - emit(Event::Ended { generation }); + emit(Event::Ended { generation: c.generation }); } - } else if !player.is_paused() { - let position = player.get_pos(); + } else if !o.player.is_paused() { + let position = o.player.get_pos(); // Whole-tick resolution is plenty for a progress bar. let bucket = position.as_millis() / TICK.as_millis(); if last_reported != Some(bucket) { last_reported = Some(bucket); - emit(Event::Position { generation, position }); + emit(Event::Position { generation: c.generation, position }); } } } } +/// Opens the current default device and puts the loaded track back where it was. +fn reopen( + old: Option, + commands: &mpsc::Sender, + current: &Option, + volume: f32, + playing: bool, + emit: &impl Fn(Event), +) -> Option { + let position = old.as_ref().map(|o| o.player.get_pos()); + let had_output = old.is_some(); + drop(old); + let output = match open(commands) { + Ok(o) => o, + Err(e) => { + if had_output { + emit(Event::NoOutput(e)); + } + return None; + } + }; + output.player.set_volume(volume); + if let Some(c) = current + && let Ok(source) = decode(c) + { + output.player.append(source); + if let Some(at) = position { + let _ = output.player.try_seek(at); + } + if playing { + output.player.play(); + } else { + output.player.pause(); + } + } + if !had_output { + emit(Event::OutputReady); + } + Some(output) +} + #[cfg(test)] mod tests { use super::buffer_frames; diff --git a/crates/musyx/src/player/mod.rs b/crates/musyx/src/player/mod.rs index c81dfe4..eca5112 100644 --- a/crates/musyx/src/player/mod.rs +++ b/crates/musyx/src/player/mod.rs @@ -366,10 +366,10 @@ impl Player { Event::NoOutput(reason) => { eprintln!("audio output: {reason}"); self.notice = Some( - "No sound output found. Connect speakers or headphones, then restart Musyx." - .into(), + "No sound output found. Connect speakers or headphones and playback picks up.".into(), ); } + Event::OutputReady => self.notice = None, Event::Loaded { generation, duration } if generation == self.generation => { if let Some(d) = duration.filter(|d| !d.is_zero()) { self.duration = d; diff --git a/crates/musyx/src/screens/mod.rs b/crates/musyx/src/screens/mod.rs index fad878b..dfd6cba 100644 --- a/crates/musyx/src/screens/mod.rs +++ b/crates/musyx/src/screens/mod.rs @@ -4,6 +4,7 @@ pub mod browse; pub mod collection; pub mod detail; pub mod search; +pub mod settings; pub mod sign_in; pub mod wave; @@ -72,10 +73,11 @@ pub struct Ctx<'a> { pub player: &'a crate::player::Player, pub wave: &'a wave::WaveScreen, pub wave_phase: f32, + pub settings: &'a crate::store::Settings, } pub fn view<'a>(ctx: Ctx<'a>) -> Element<'a, Message> { - let Ctx { env, route, search, me, library, pages, discover, genre_playlists, player, wave, wave_phase } = ctx; + let Ctx { env, route, search, me, library, pages, discover, genre_playlists, player, wave, wave_phase, settings } = ctx; let t = env.t; let content: Column<'a, Message> = match route { Route::Home => { @@ -100,7 +102,7 @@ pub fn view<'a>(ctx: Ctx<'a>) -> Element<'a, Message> { column![detail::view(env, route, pages.get(&route).unwrap_or(&Loadable::Loading))] } Route::Podcasts => column![browse::podcasts(env, discover, &library.albums)], - Route::Settings => column![title(t, "Settings"), account_card(t, me)], + Route::Settings => column![settings::view(t, settings, account_card(t, me))], }; content @@ -110,10 +112,6 @@ pub fn view<'a>(ctx: Ctx<'a>) -> Element<'a, Message> { .into() } -fn title<'a>(t: &'static Tokens, text: impl Into) -> Element<'a, Message> { - line(text.into(), theme::DISPLAY, size::DISPLAY_S, t.fg).into() -} - fn account_card<'a>(t: &'static Tokens, me: &'a Account) -> Element<'a, Message> { let avatar = container(line(me.initial().to_string(), theme::SEMIBOLD, 22.0, iced::Color::from_rgb8(0x1C, 0x1A, 0x22))) .center(56) diff --git a/crates/musyx/src/screens/settings.rs b/crates/musyx/src/screens/settings.rs new file mode 100644 index 0000000..c520f94 --- /dev/null +++ b/crates/musyx/src/screens/settings.rs @@ -0,0 +1,61 @@ +//! Settings: account, streaming quality, appearance, storage. + +use iced::widget::{Row, button, column, container, row}; +use iced::{Alignment, Element, Fill}; +use crate::app::Message; +use crate::store::{Appearance, Quality, Settings}; +use crate::ui::icons::{Icon, icon}; +use crate::ui::theme::{self, Tokens, size}; +use crate::ui::{line, para}; + +pub fn view<'a>(t: &'static Tokens, settings: &Settings, account: Element<'a, Message>) -> Element<'a, Message> { + let quality = Row::with_children(Quality::ALL.map(|q| chip(t, q.label(), q == settings.quality, Message::SetQuality(q)))) + .spacing(6); + let appearance = + Row::with_children(Appearance::ALL.map(|a| chip(t, a.label(), a == settings.appearance, Message::SetAppearance(a)))) + .spacing(6); + + column![ + line("Settings", theme::DISPLAY, size::DISPLAY_S, t.fg), + account, + section(t, "Streaming quality", column![quality, para(settings.quality.detail(), size::META, t.muted)].spacing(10).into()), + section(t, "Appearance", appearance.into()), + section( + t, + "Storage", + column![ + para( + "Covers are kept on disk so pages open instantly next time. Clearing them frees the space; they download again as you browse.", + size::META, + t.muted, + ), + button(row![icon(Icon::Trash, t.fg), line("Clear cover cache", theme::MEDIUM, size::BODY, t.fg)].spacing(8).align_y(Alignment::Center)) + .padding([9, 16]) + .style(theme::ghost) + .on_press(Message::ClearCoverCache), + ] + .spacing(12) + .into(), + ), + line(format!("Musyx {} · unofficial Yandex Music client", env!("CARGO_PKG_VERSION")), theme::BODY, size::SMALL, t.muted), + ] + .spacing(28) + .width(Fill) + .into() +} + +fn section<'a>(t: &'static Tokens, title: &'a str, body: Element<'a, Message>) -> Element<'a, Message> { + container(column![line(title, theme::SEMIBOLD, size::SECTION, t.fg), body].spacing(14)) + .padding(24) + .width(Fill) + .style(theme::card) + .into() +} + +fn chip<'a>(t: &'static Tokens, label: &'static str, on: bool, msg: Message) -> Element<'a, Message> { + button(line(label, theme::MEDIUM, 13.5, if on { t.accent_ink } else { t.fg })) + .padding([7, 13]) + .style(theme::chip(on)) + .on_press_maybe((!on).then_some(msg)) + .into() +} diff --git a/crates/musyx/src/store.rs b/crates/musyx/src/store.rs new file mode 100644 index 0000000..31746c7 --- /dev/null +++ b/crates/musyx/src/store.rs @@ -0,0 +1,131 @@ +//! Preferences kept between launches, as JSON in the platform config folder +//! (`~/Library/Application Support/Musyx/settings.json` on macOS). + +use std::path::PathBuf; + +use serde::{Deserialize, Serialize}; + +/// Streaming quality, as a cap on the bitrate Musyx asks for. +#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)] +#[serde(rename_all = "kebab-case")] +pub enum Quality { + /// The best Yandex offers (usually MP3 320). + #[default] + Best, + /// Up to 192 kbps. + Balanced, + /// Up to 128 kbps, for slow or metered connections. + DataSaver, +} + +impl Quality { + pub const ALL: [Quality; 3] = [Quality::Best, Quality::Balanced, Quality::DataSaver]; + + pub fn label(self) -> &'static str { + match self { + Quality::Best => "Best", + Quality::Balanced => "Balanced", + Quality::DataSaver => "Data saver", + } + } + + pub fn detail(self) -> &'static str { + match self { + Quality::Best => "Highest bitrate available, usually MP3 320 kbps.", + Quality::Balanced => "Up to 192 kbps. About 40% less data.", + Quality::DataSaver => "Up to 128 kbps, for slow or metered connections.", + } + } + + /// The bitrate cap passed to the API; `None` means no cap. + pub fn max_kbps(self) -> Option { + match self { + Quality::Best => None, + Quality::Balanced => Some(192), + Quality::DataSaver => Some(128), + } + } +} + +#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)] +#[serde(rename_all = "kebab-case")] +pub enum Appearance { + /// Follow the system's light or dark setting. + #[default] + System, + Light, + Dark, +} + +impl Appearance { + pub const ALL: [Appearance; 3] = [Appearance::System, Appearance::Light, Appearance::Dark]; + + pub fn label(self) -> &'static str { + match self { + Appearance::System => "Match system", + Appearance::Light => "Light", + Appearance::Dark => "Dark", + } + } +} + +#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)] +#[serde(default)] +pub struct Settings { + pub quality: Quality, + pub appearance: Appearance, + pub volume: f32, +} + +impl Default for Settings { + fn default() -> Self { + Self { quality: Quality::Best, appearance: Appearance::System, volume: 0.7 } + } +} + +fn path() -> Option { + directories::ProjectDirs::from("", "", "Musyx").map(|d| d.config_dir().join("settings.json")) +} + +/// Saved settings, or defaults when there are none or the file is unreadable. +/// Read once at startup, on the main thread; the file is tiny. +pub fn load() -> Settings { + path() + .and_then(|p| std::fs::read_to_string(p).ok()) + .and_then(|s| serde_json::from_str(&s).ok()) + .unwrap_or_default() +} + +/// Writes atomically (temp file, then rename) so a crash can't leave half a file. +pub async fn save(settings: Settings) -> Result<(), String> { + let path = path().ok_or("no config folder on this system")?; + let json = serde_json::to_vec_pretty(&settings).map_err(|e| e.to_string())?; + if let Some(dir) = path.parent() { + tokio::fs::create_dir_all(dir).await.map_err(|e| e.to_string())?; + } + let tmp = path.with_extension("json.tmp"); + tokio::fs::write(&tmp, json).await.map_err(|e| e.to_string())?; + tokio::fs::rename(&tmp, &path).await.map_err(|e| e.to_string()) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn settings_round_trip_and_tolerate_missing_fields() { + let s = Settings { quality: Quality::DataSaver, appearance: Appearance::Dark, volume: 0.25 }; + let json = serde_json::to_string(&s).unwrap(); + assert!(json.contains("\"data-saver\""), "{json}"); + assert_eq!(serde_json::from_str::(&json).unwrap(), s); + let partial: Settings = serde_json::from_str(r#"{"appearance":"light"}"#).unwrap(); + assert_eq!(partial, Settings { appearance: Appearance::Light, ..Settings::default() }); + } + + #[test] + fn quality_caps() { + assert_eq!(Quality::Best.max_kbps(), None); + assert_eq!(Quality::Balanced.max_kbps(), Some(192)); + assert_eq!(Quality::DataSaver.max_kbps(), Some(128)); + } +} diff --git a/crates/musyx/src/widgets/drawer.rs b/crates/musyx/src/widgets/drawer.rs index fa2247b..eff49e3 100644 --- a/crates/musyx/src/widgets/drawer.rs +++ b/crates/musyx/src/widgets/drawer.rs @@ -67,7 +67,18 @@ pub fn view<'a>( (Panel::Lyrics, Some(_)) => match lyrics { Some(Loadable::Loaded(Some(l))) => lyrics_view(t, l, player.position()), Some(Loadable::Loaded(None)) => note(t, "Yandex Music has no lyrics for this track."), - Some(Loadable::Failed(_)) => note(t, "Couldn't load the lyrics. Close and reopen this panel to try again."), + Some(Loadable::Failed(_)) => column![ + note(t, "Couldn't load the lyrics. Check your connection and try again."), + container( + button(line("Try again", theme::SEMIBOLD, size::BODY, t.accent_ink)) + .padding([9, 16]) + .style(theme::primary) + .on_press(Message::RetryLyrics), + ) + .padding([0, 20]), + ] + .spacing(12) + .into(), _ => note(t, "Loading lyrics…"), }, }; diff --git a/crates/ym-api/src/client.rs b/crates/ym-api/src/client.rs index 5a8df8d..a9fb205 100644 --- a/crates/ym-api/src/client.rs +++ b/crates/ym-api/src/client.rs @@ -138,10 +138,10 @@ impl YmClient { Ok(tracks.into_iter().filter_map(Track::from_yamuse).collect()) } - /// Resolves a signed, short-lived audio URL for a track. - pub async fn stream(&self, track_id: &str) -> Result { + /// Resolves a signed, short-lived audio URL for a track, at most `max_kbps` when set. + pub async fn stream(&self, track_id: &str, max_kbps: Option) -> Result { let variants = self.inner.track_download_info(track_id).await?; - let variant = best_variant(&variants) + let variant = best_variant(&variants, max_kbps) .ok_or_else(|| Error::Api(format!("no playable variant for track {track_id}")))?; let url = variant.direct_link(self.inner.transport()).await?; Ok(Stream { diff --git a/crates/ym-api/src/models.rs b/crates/ym-api/src/models.rs index a1323e1..8b8f390 100644 --- a/crates/ym-api/src/models.rs +++ b/crates/ym-api/src/models.rs @@ -139,21 +139,23 @@ impl Stream { } } -/// Picks the variant to play: full tracks over previews, MP3 over AAC (MP3 seeks -/// reliably), then the highest bitrate. +/// Picks the variant to play: full tracks over previews, then the highest bitrate +/// within `max_kbps` (or the lowest there is, when everything is above it), then +/// MP3 over AAC (MP3 seeks reliably). pub(crate) fn best_variant( variants: &[yamuse::models::DownloadInfo], + max_kbps: Option, ) -> Option<&yamuse::models::DownloadInfo> { + let cap = max_kbps.map_or(i64::MAX, i64::from); variants .iter() .filter(|v| v.download_info_url.is_some()) .filter(|v| matches!(v.codec.as_deref(), Some("mp3" | "aac"))) .max_by_key(|v| { - ( - !v.preview.unwrap_or(false), - v.codec.as_deref() == Some("mp3"), - v.bitrate_in_kbps.unwrap_or(0), - ) + let kbps = v.bitrate_in_kbps.unwrap_or(0); + // Within the cap, higher is better; above it, closer to the cap is better. + let fit = if kbps <= cap { (1, kbps) } else { (0, -kbps) }; + (!v.preview.unwrap_or(false), fit, v.codec.as_deref() == Some("mp3")) }) } @@ -212,12 +214,14 @@ mod tests { {"codec":"flac","bitrateInKbps":900,"downloadInfoUrl":"f"}]"#, ) .unwrap(); - assert_eq!(best_variant(&v).unwrap().download_info_url.as_deref(), Some("c")); + assert_eq!(best_variant(&v, None).unwrap().download_info_url.as_deref(), Some("c")); + assert_eq!(best_variant(&v, Some(192)).unwrap().download_info_url.as_deref(), Some("b")); + assert_eq!(best_variant(&v, Some(64)).unwrap().download_info_url.as_deref(), Some("b"), "nothing fits: take the smallest"); let previews: Vec = serde_json::from_str( r#"[{"codec":"mp3","bitrateInKbps":128,"downloadInfoUrl":"p","preview":true}]"#, ) .unwrap(); - assert!(best_variant(&previews).unwrap().preview.unwrap()); - assert!(best_variant(&[]).is_none()); + assert!(best_variant(&previews, None).unwrap().preview.unwrap()); + assert!(best_variant(&[], None).is_none()); } } diff --git a/tool/bundle-macos.sh b/tool/bundle-macos.sh new file mode 100755 index 0000000..8697659 --- /dev/null +++ b/tool/bundle-macos.sh @@ -0,0 +1,60 @@ +#!/usr/bin/env bash +# Builds Musyx.app (release, ad-hoc signed) into target/release/bundle/. +# tool/bundle-macos.sh # build the bundle +# tool/bundle-macos.sh --install # and copy it to /Applications +set -euo pipefail + +root="$(cd "$(dirname "$0")/.." && pwd)" +cd "$root" + +version="$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -1)" +bundle="target/release/bundle/Musyx.app" + +cargo build --release -p musyx + +rm -rf "$bundle" +mkdir -p "$bundle/Contents/MacOS" "$bundle/Contents/Resources" +cp target/release/musyx "$bundle/Contents/MacOS/Musyx" + +# Icon: every size macOS asks for, from the 1024px master. +iconset="$(mktemp -d)/Musyx.iconset" +mkdir -p "$iconset" +master="crates/musyx/assets/icon/musyx.png" +for size in 16 32 128 256 512; do + sips -z "$size" "$size" "$master" --out "$iconset/icon_${size}x${size}.png" >/dev/null + double=$((size * 2)) + sips -z "$double" "$double" "$master" --out "$iconset/icon_${size}x${size}@2x.png" >/dev/null +done +iconutil -c icns "$iconset" -o "$bundle/Contents/Resources/Musyx.icns" + +cat > "$bundle/Contents/Info.plist" < + + + + CFBundleNameMusyx + CFBundleDisplayNameMusyx + CFBundleIdentifierdev.musyx.desktop + CFBundleExecutableMusyx + CFBundleIconFileMusyx + CFBundlePackageTypeAPPL + CFBundleShortVersionString${version} + CFBundleVersion${version} + LSMinimumSystemVersion11.0 + LSApplicationCategoryTypepublic.app-category.music + NSHighResolutionCapable + NSHumanReadableCopyrightUnofficial Yandex Music client. Not affiliated with Yandex. + + +PLIST + +# Ad-hoc signature: enough to run locally. Each new build is a new identity to the +# keychain, so macOS may ask once to allow access to the saved sign-in. +codesign --force --deep --sign - "$bundle" + +echo "Built $bundle ($version)" +if [[ "${1:-}" == "--install" ]]; then + rm -rf "/Applications/Musyx.app" + cp -R "$bundle" /Applications/ + echo "Installed /Applications/Musyx.app" +fi diff --git a/tool/make_icon.py b/tool/make_icon.py new file mode 100755 index 0000000..0e608f4 --- /dev/null +++ b/tool/make_icon.py @@ -0,0 +1,84 @@ +#!/usr/bin/env python3 +"""Draws the Musyx app icon (1024x1024 PNG) with no dependencies. + +Aubergine squircle with amber wave lines, matching the My Wave hero. +Usage: python3 tool/make_icon.py crates/musyx/assets/icon/musyx.png +""" +import math +import struct +import sys +import zlib + +SIZE = 1024 +# macOS icon grid: the body is 824px, centred, with a ~185px corner radius. +BODY, RADIUS = 824, 185 +OFF = (SIZE - BODY) / 2 +TOP, BOTTOM = (0x35, 0x30, 0x42), (0x1C, 0x1A, 0x22) +AMBER = (0xF0, 0xB2, 0x3E) +LINES = 11 + + +def rounded_alpha(x, y): + """Coverage of the rounded square at pixel centre (x, y), anti-aliased.""" + px, py = x + 0.5 - OFF, y + 0.5 - OFF + cx = min(max(px, RADIUS), BODY - RADIUS) + cy = min(max(py, RADIUS), BODY - RADIUS) + d = math.hypot(px - cx, py - cy) - RADIUS + if px < 0 or py < 0 or px > BODY or py > BODY: + d = max(d, 1.0) + return min(max(0.5 - d, 0.0), 1.0) + + +def wave(k, x): + """Height of line k at x, and its slope, in pixels.""" + u = (x - OFF) / BODY + base = OFF + BODY * (0.34 + k * 0.034) + amp = BODY * (0.045 + k * 0.006) + f = 1.5 + k * 0.08 + ph = k * 0.55 + 1.1 + a = u * math.pi * f + ph + b = u * math.pi * 4.2 - ph * 0.7 + y = base + math.sin(a) * amp + math.sin(b) * amp * 0.35 + dy = (math.cos(a) * amp * math.pi * f + math.cos(b) * amp * 0.35 * math.pi * 4.2) / BODY + return y, dy + + +def main(out): + rows = [] + curves = [[wave(k, x + 0.5) for x in range(SIZE)] for k in range(LINES)] + for y in range(SIZE): + row = bytearray([0]) # filter: none + t = y / SIZE + bg = tuple(round(TOP[i] + (BOTTOM[i] - TOP[i]) * t) for i in range(3)) + for x in range(SIZE): + cover = rounded_alpha(x, y) + if cover == 0.0: + row += b"\x00\x00\x00\x00" + continue + r, g, b = bg + for k in range(LINES): + cy, slope = curves[k][x] + dist = abs(y + 0.5 - cy) / math.sqrt(1 + slope * slope) + width = 4.0 + k * 0.9 + a = min(max(width / 2 - dist + 0.5, 0.0), 1.0) + if a: + a *= 0.18 + 0.82 * (k / (LINES - 1)) + r = r + (AMBER[0] - r) * a + g = g + (AMBER[1] - g) * a + b = b + (AMBER[2] - b) * a + row += bytes((round(r), round(g), round(b), round(cover * 255))) + rows.append(bytes(row)) + + def chunk(kind, data): + return struct.pack(">I", len(data)) + kind + data + struct.pack(">I", zlib.crc32(kind + data) & 0xFFFFFFFF) + + png = b"\x89PNG\r\n\x1a\n" + png += chunk(b"IHDR", struct.pack(">IIBBBBB", SIZE, SIZE, 8, 6, 0, 0, 0)) + png += chunk(b"IDAT", zlib.compress(b"".join(rows), 9)) + png += chunk(b"IEND", b"") + with open(out, "wb") as f: + f.write(png) + + +if __name__ == "__main__": + main(sys.argv[1] if len(sys.argv) > 1 else "musyx.png")