diff --git a/Cargo.lock b/Cargo.lock index 51d9a33..494da1e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1559,8 +1559,6 @@ dependencies = [ [[package]] name = "federation-net" version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e5c2e6e5af020dc202d4924125ef57719aa21f8d2567e2d943914386bc8980" dependencies = [ "blake3", "data-encoding", @@ -1698,9 +1696,7 @@ dependencies = [ [[package]] name = "furumi-library" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f78466b6345cb90d7bb37db5d9dd67476ab6c2c3b2202876d24f448c314a9a08" +version = "0.3.0" dependencies = [ "anyhow", "blake3", @@ -3239,16 +3235,16 @@ dependencies = [ [[package]] name = "music-dht" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c3f75d49d3a742a6777a1c4cc53f397399dfc9ddb70034c57aeb44d75d2ee4f" +version = "0.6.0" dependencies = [ "async-trait", "blake3", "data-encoding", + "encoding_rs", "federation-net", "futures", "postcard", + "quick-xml", "rand 0.9.5", "rusqlite", "serde", @@ -3257,6 +3253,7 @@ dependencies = [ "tokio", "tracing", "unicode-normalization", + "url", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 0c76128..0da4f4e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,12 +27,12 @@ crokey = "1.4.0" crossterm = { version = "0.29.0", features = ["event-stream"] } directories = "6.0.0" futures-util = "0.3.32" -furumi-library = "0.2.0" +furumi-library = "0.3.0" image = { version = "0.25.10", default-features = false, features = ["jpeg", "png", "webp", "gif", "bmp"] } lofty = "0.22" # P2P federation: library index in a shared DHT + audio streaming between # peers (same protocol as furumi-fd). -music-dht = "0.5.0" +music-dht = { version = "0.6.0", features = ["podcast-feed"] } ratatui = "0.30.1" reqwest = { version = "0.12.28", default-features = false, features = ["rustls-tls", "stream", "blocking"] } rhai = { version = "1", features = ["sync"] } diff --git a/src/app/mod.rs b/src/app/mod.rs index 8c90611..6cbb59d 100644 --- a/src/app/mod.rs +++ b/src/app/mod.rs @@ -4361,6 +4361,7 @@ mod similarity_search_tests { file_size_bytes: None, play_count: 0, fed: None, + podcast: None, }, score, embedding_signature: [signature; music_dht::similarity::SIMILARITY_SIGNATURE_BYTES], @@ -4438,6 +4439,7 @@ mod queue_refresh_tests { file_size_bytes: None, play_count: 0, fed: None, + podcast: None, } } diff --git a/src/app/state.rs b/src/app/state.rs index a787484..bf550b9 100644 --- a/src/app/state.rs +++ b/src/app/state.rs @@ -338,6 +338,7 @@ mod tests { file_size_bytes: None, play_count: 0, fed: None, + podcast: None, }], }; let mut state = AppState::default(); diff --git a/src/app/update_tests.rs b/src/app/update_tests.rs index b4efc57..58d1d0e 100644 --- a/src/app/update_tests.rs +++ b/src/app/update_tests.rs @@ -128,6 +128,7 @@ fn test_track(id: i64) -> TrackItem { file_size_bytes: None, play_count: 0, fed: None, + podcast: None, } } @@ -522,6 +523,7 @@ fn queue_advances_and_respects_repeat() { file_size_bytes: None, play_count: 0, fed: None, + podcast: None, }; let mut state = AppState::default(); state.player.queue = vec![track(1), track(2)]; @@ -587,6 +589,7 @@ fn queue_tab_select_and_clear() { file_size_bytes: None, play_count: 0, fed: None, + podcast: None, }; let mut state = AppState { active_tab: Tab::Queue, @@ -1062,6 +1065,7 @@ fn shuffle_reorders_tail_and_restores() { file_size_bytes: None, play_count: 0, fed: None, + podcast: None, }; let mut state = AppState::default(); state.player.queue = (1..=8).map(track).collect(); @@ -1109,6 +1113,7 @@ fn shift_j_opens_release_from_queue() { file_size_bytes: None, play_count: 0, fed: None, + podcast: None, }; let mut state = AppState { active_tab: Tab::Queue, diff --git a/src/devices.rs b/src/devices.rs index 60259c1..b6d04b7 100644 --- a/src/devices.rs +++ b/src/devices.rs @@ -229,6 +229,7 @@ impl PlaybackTrack { file_size_bytes: self.file_size_bytes, play_count: self.play_count, fed: self.fed.as_ref().map(SyncedFedTrack::to_fed_track), + podcast: None, } } } diff --git a/src/devices/tests.rs b/src/devices/tests.rs index a47a0cc..21f1d3f 100644 --- a/src/devices/tests.rs +++ b/src/devices/tests.rs @@ -478,6 +478,7 @@ fn playback_tracks_do_not_sync_device_local_paths() { file_size_bytes: Some(123_456), play_count: 3, fed: None, + podcast: None, }; let wire = PlaybackTrack::from_track(&source); diff --git a/src/federation/mod.rs b/src/federation/mod.rs index 5ac9604..019d857 100644 --- a/src/federation/mod.rs +++ b/src/federation/mod.rs @@ -2333,6 +2333,7 @@ fn metadata_preview_track( .or(base.file_size_bytes), play_count: base.play_count, fed: Some(fed.clone()), + podcast: None, } } @@ -2948,6 +2949,7 @@ pub fn pending_track(fed: &FedTrack) -> TrackItem { file_size_bytes: None, play_count: 0, fed: Some(fed.clone()), + podcast: None, } } @@ -3020,6 +3022,7 @@ fn ephemeral_track( // Keep the federation reference: the cached track can still be // liked, re-downloaded and marked as federated in the lists. fed: Some(fed.clone()), + podcast: None, } } diff --git a/src/share.rs b/src/share.rs index bd753a8..b07490d 100644 --- a/src/share.rs +++ b/src/share.rs @@ -154,6 +154,7 @@ mod tests { file_size_bytes: None, play_count: 0, fed: None, + podcast: None, }; assert_eq!( @@ -231,6 +232,7 @@ mod tests { file_size_bytes: None, play_count: 0, fed: None, + podcast: None, }; let link = track_share_link(&track).expect("link"); let parsed = parse_frid_link(&link).expect("parses back"); diff --git a/src/ui/status_tests.rs b/src/ui/status_tests.rs index c6656a4..fe48f73 100644 --- a/src/ui/status_tests.rs +++ b/src/ui/status_tests.rs @@ -24,6 +24,7 @@ fn playing_state() -> AppState { file_size_bytes: None, play_count: 0, fed: None, + podcast: None, }); state.player.playing = true; state.player.position_secs = 12.0;