diff --git a/CHANGELOG.md b/CHANGELOG.md index 61acca5..e28198b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [0.5.0] - unreleased +## [0.5.0] - 2026-11-20 ### Added @@ -51,15 +51,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 in the Podcasts tab instead, also when this device follows the feed under the newer address it moved to (known once the feed was read), and subscribing to such an older address adds no second subscription. - -### Changed - -- `furumi-tui` 0.5.0. - -## [0.4.0] - unreleased - -### Added - - A Podcasts tab on `4`: subscribe to RSS/Atom feeds by URL, browse podcast → seasons → episodes with saved position, played state, duration and date, search episodes, filter by listening state, change the order, mark @@ -100,7 +91,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- `music-dht` 0.6.0 and `furumi-library` 0.3.0. +- `furumi-tui` 0.5.0. +- Use published `music-dht` 0.6.0 and `furumi-library` 0.3.0 from crates.io; + remove the temporary FRID fork patches. +- Self-update and release download links use the canonical + `Furumi-stack/furumi-tui` GitHub repository. - Queue items are keyed by their source: podcast episodes by episode id, library rows as `lib:` instead of `local:`. Likes, playlists, music history, similarity, share links and metadata edits skip episodes. @@ -138,6 +133,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- Isolate log privacy and identity-lock lifecycle tests from process-wide + state and descriptor inheritance in parallel tests. - The protocol version stored for another device came from this build's own constant (on profile announcements and accepted pairings), not from the device. Versions now come from the device's own reports; relayed profiles diff --git a/Cargo.lock b/Cargo.lock index 493d33f..f680970 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1143,7 +1143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c54e03a951783e8b327515db3f2a2fd0e3bed362a96b066f341ce66ed49b4ead" dependencies = [ "data-encoding", - "syn 3.0.4", + "syn 1.0.109", ] [[package]] @@ -1269,7 +1269,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -1455,7 +1455,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -1559,7 +1559,8 @@ dependencies = [ [[package]] name = "federation-net" version = "0.3.1" -source = "git+https://gt.hexor.cy/Sanapach/frid.git?branch=podcasts%2Fdiscovery#9c82f6d91691a66d0a559caba06e13a1293f06be" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01e5c2e6e5af020dc202d4924125ef57719aa21f8d2567e2d943914386bc8980" dependencies = [ "blake3", "data-encoding", @@ -1698,7 +1699,8 @@ dependencies = [ [[package]] name = "furumi-library" version = "0.3.0" -source = "git+https://gt.hexor.cy/Sanapach/frid.git?branch=podcasts%2Fdiscovery#9c82f6d91691a66d0a559caba06e13a1293f06be" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e7eb785cc6ab5b59db8ef74ffa05d798afde45fbd86da08aecf356432a52d10" dependencies = [ "anyhow", "blake3", @@ -3238,7 +3240,8 @@ dependencies = [ [[package]] name = "music-dht" version = "0.6.0" -source = "git+https://gt.hexor.cy/Sanapach/frid.git?branch=podcasts%2Fdiscovery#9c82f6d91691a66d0a559caba06e13a1293f06be" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ce81f361952228654c28a46e41555f2c3d1520bf8c6c76562e7a53f70dd38e1" dependencies = [ "async-trait", "blake3", @@ -3654,7 +3657,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -3739,7 +3742,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" dependencies = [ - "proc-macro-crate 3.5.0", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.119", @@ -4537,7 +4540,7 @@ dependencies = [ "once_cell", "socket2 0.6.5", "tracing", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -5053,7 +5056,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -5111,7 +5114,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -5925,7 +5928,7 @@ dependencies = [ "getrandom 0.4.3", "once_cell", "rustix 1.1.4", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -7029,7 +7032,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.48.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index cee9a1c..6f2c6f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,9 +57,6 @@ unicode-width = "0.2.2" # souvlaki 0.8.3 still depends on the unmaintained block 0.1.6. Keep its API # intact while using an opaque inhabited FFI type accepted by current Rust. block = { path = "vendor/block" } -# Unpublished frid (MR-F1, MR-F2, MR-F3); remove once music-dht 0.6.0 and furumi-library 0.3.0 are on crates.io. -music-dht = { git = "https://gt.hexor.cy/Sanapach/frid.git", branch = "podcasts/discovery" } -furumi-library = { git = "https://gt.hexor.cy/Sanapach/frid.git", branch = "podcasts/discovery" } [target.'cfg(target_os="macos")'.dependencies] core-foundation = "0.10.1" diff --git a/README.md b/README.md index 827f3d8..f5a997c 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ furumi ### Linux, Windows, and other platforms Download a prebuilt archive from the -[GitHub releases](https://github.com/house-of-vanity/furumi_tui/releases), or +[GitHub releases](https://github.com/Furumi-stack/furumi-tui/releases), or build Furumi from source with Rust 1.97 or newer: The repository selects the stable Rust toolchain. With rustup, run @@ -458,8 +458,8 @@ owner_timeout_ms = 120000 All clients must support the new coordination envelope for eventual single output ownership. frid's `PLAYBACK_PROTOCOL.md` describes the protocol, adapter -contract and rollout. Local Cargo patches are only for development; publish -frid and bump the client dependency versions before releasing these changes. +contract and rollout. This release uses the published FRID crates +`music-dht 0.6.0` and `furumi-library 0.3.0` from crates.io. Run the local protocol checks from the TUI repository: diff --git a/src/devices/podcast_sync_tests.rs b/src/devices/podcast_sync_tests.rs index e06bba3..d1f8770 100644 --- a/src/devices/podcast_sync_tests.rs +++ b/src/devices/podcast_sync_tests.rs @@ -1241,6 +1241,29 @@ fn only_bare_music_items_from_old_devices_count_as_echoed_placeholders() { /// the Logs tab) never prints them. #[test] fn podcast_payloads_are_not_written_to_the_debug_log() { + // Tracing caches callsite interest globally. Other tests can change it + // while this thread-local subscriber is active, making an expected + // event disappear. Keep the real log assertions in an isolated process. + const ISOLATED: &str = "FURUMI_TEST_ISOLATED_PODCAST_LOG"; + if std::env::var_os(ISOLATED).is_none() { + let output = std::process::Command::new(std::env::current_exe().unwrap()) + .args([ + "--exact", + "devices::podcast_sync_tests::podcast_payloads_are_not_written_to_the_debug_log", + "--nocapture", + ]) + .env(ISOLATED, "1") + .output() + .unwrap(); + assert!( + output.status.success(), + "isolated log capture failed:\n{}\n{}", + String::from_utf8_lossy(&output.stdout), + String::from_utf8_lossy(&output.stderr), + ); + return; + } + use std::io::Write; use tracing_subscriber::Layer as _; use tracing_subscriber::layer::SubscriberExt as _; diff --git a/src/devices/tests.rs b/src/devices/tests.rs index b858a80..69d33d1 100644 --- a/src/devices/tests.rs +++ b/src/devices/tests.rs @@ -482,6 +482,29 @@ fn test_sync() -> DeviceSync { #[test] fn device_identity_has_one_coordinator_across_installation_paths() { + // Other tests spawn processes in parallel. A child can briefly inherit + // this test's locked file before exec closes it, delaying release after + // drop(first). Keep the lock lifecycle in its own test process. + const ISOLATED: &str = "FURUMI_TEST_ISOLATED_IDENTITY_LOCK"; + if std::env::var_os(ISOLATED).is_none() { + let output = std::process::Command::new(std::env::current_exe().unwrap()) + .args([ + "--exact", + "devices::tests::device_identity_has_one_coordinator_across_installation_paths", + "--nocapture", + ]) + .env(ISOLATED, "1") + .output() + .unwrap(); + assert!( + output.status.success(), + "isolated identity lock test failed:\n{}\n{}", + String::from_utf8_lossy(&output.stdout), + String::from_utf8_lossy(&output.stderr), + ); + return; + } + let dir = tempfile::tempdir().unwrap(); let path = dir.path().join("sync.sqlite3"); let first = acquire_identity_lock(&path).unwrap(); diff --git a/src/updater.rs b/src/updater.rs index f9afc50..439d508 100644 --- a/src/updater.rs +++ b/src/updater.rs @@ -13,7 +13,7 @@ use semver::Version; use serde::Deserialize; use sha2::{Digest, Sha256}; -const REPOSITORY: &str = "https://api.github.com/repos/house-of-vanity/furumi_tui"; +const REPOSITORY: &str = "https://api.github.com/repos/Furumi-stack/furumi-tui"; const MAX_ARCHIVE: u64 = 512 * 1024 * 1024; #[derive(Debug, Clone, PartialEq, Eq)]