mark/musicdb
1
0
Fork 0
mirror of https://github.com/Dummi26/musicdb.git synced 2025-12-14 11:56:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

added edit panel and fixed bug where Modify* command would be decoded as Add* command by the server

Browse Source
This commit is contained in:
Mark
2023-08-27 21:53:00 +02:00
parent 55590a1549
commit 0e5e33367d
11 changed files with 661 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,8 +48,16 @@ impl Song {
cached_data: Arc::new(Mutex::new(None)),
}
}
pub fn uncache_data(&self) {
*self.cached_data.lock().unwrap() = None;
pub fn uncache_data(&self) -> Result<(), ()> {
let mut cached = self.cached_data.lock().unwrap();
match cached.as_ref() {
Some(Ok(_data)) => {
*cached = None;
Ok(())
}
Some(Err(_thread)) => Err(()),
None => Ok(()),
}
}
/// If no data is cached yet and no caching thread is running, starts a thread to cache the data.
pub fn cache_data_start_thread(&self, db: &Database) -> bool {

25
musicdb-lib/src/player/mod.rs
View File

@@ -1,4 +1,4 @@
use std::sync::Arc;
use std::{collections::HashSet, sync::Arc};
use awedio::{
backends::CpalBackend,
@@ -23,6 +23,7 @@ pub struct Player {
)>,
manager: Manager,
current_song_id: SongOpt,
cached: HashSet<SongId>,
}
pub enum SongOpt {
@@ -40,6 +41,7 @@ impl Player {
backend,
source: None,
current_song_id: SongOpt::None,
cached: HashSet::new(),
})
}
pub fn handle_command(&mut self, command: &Command) {
@@ -121,6 +123,7 @@ impl Player {
};
if db.playing {
if let Some(bytes) = song.cached_data_now(db) {
self.cached.insert(song.id);
match Self::sound_from_bytes(ext, bytes) {
Ok(v) => {
let (sound, notif) =
@@ -140,6 +143,7 @@ impl Player {
} else {
self.source = None;
song.cache_data_start_thread(&db);
self.cached.insert(song.id);
}
} else {
panic!("invalid song ID: current_song_id not found in DB!");
@@ -148,8 +152,25 @@ impl Player {
} else {
self.current_song_id = SongOpt::None;
}
if let Some(Some(song)) = db.queue.get_next_song().map(|v| db.get_song(v)) {
let next_song = db.queue.get_next_song().and_then(|v| db.get_song(v));
for &id in &self.cached {
if Some(id) != next_song.map(|v| v.id)
&& !matches!(self.current_song_id, SongOpt::Some(v) if v == id)
{
if let Some(song) = db.songs().get(&id) {
if let Ok(()) = song.uncache_data() {
self.cached.remove(&id);
break;
}
} else {
self.cached.remove(&id);
break;
}
}
}
if let Some(song) = next_song {
song.cache_data_start_thread(&db);
self.cached.insert(song.id);
}
}
}

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

@@ -305,9 +305,9 @@ impl ToFromBytes for Command {
0b01010000 => Self::AddSong(ToFromBytes::from_bytes(s)?),
0b01010011 => Self::AddAlbum(ToFromBytes::from_bytes(s)?),
0b01011100 => Self::AddArtist(ToFromBytes::from_bytes(s)?),
0b10010000 => Self::AddSong(ToFromBytes::from_bytes(s)?),
0b10010011 => Self::AddAlbum(ToFromBytes::from_bytes(s)?),
0b10011100 => Self::AddArtist(ToFromBytes::from_bytes(s)?),
0b10010000 => Self::ModifySong(ToFromBytes::from_bytes(s)?),
0b10010011 => Self::ModifyAlbum(ToFromBytes::from_bytes(s)?),
0b10011100 => Self::ModifyArtist(ToFromBytes::from_bytes(s)?),
0b01011101 => Self::AddCover(ToFromBytes::from_bytes(s)?),
0b00110001 => Self::SetLibraryDirectory(ToFromBytes::from_bytes(s)?),
_ => {