mark/musicdb
1
0
Fork 0
mirror of https://github.com/Dummi26/musicdb.git synced 2025-03-10 14:13:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix get-song returning "no data" instead of loading the song

Browse Source
This commit is contained in:
Mark 2024-03-28 18:55:20 +01:00
parent b70d922fad
commit 8b8f13f98a
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
musicdb-lib/src/data/song.rs
View File

@ -112,7 +112,7 @@ impl Song {
None None
} }
} }
/// Gets the cached data, if available. /// Gets or loads the cached data.
/// If a thread is running to load the data, it *is* awaited. /// If a thread is running to load the data, it *is* awaited.
/// This function will block until the data is loaded. /// This function will block until the data is loaded.
/// If it still returns none, some error must have occured. /// If it still returns none, some error must have occured.

6
musicdb-lib/src/server/get.rs
View File

@ -122,10 +122,8 @@ pub fn handle_one_connection_as_get(
.next() .next()
.and_then(|id| id.parse().ok()) .and_then(|id| id.parse().ok())
.and_then(|id| { .and_then(|id| {
db.lock() let db = db.lock().unwrap();
.unwrap() db.get_song(&id).and_then(|song| song.cached_data_now(&db))
.get_song(&id)
.and_then(|song| song.cached_data())
}) })
{ {
writeln!(connection.get_mut(), "len: {}", bytes.len())?; writeln!(connection.get_mut(), "len: {}", bytes.len())?;