mark/musicdb
1
0
Fork 0
mirror of https://github.com/Dummi26/musicdb.git synced 2025-12-18 21:57:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

server can now send error messages to clients

Browse Source
This commit is contained in:
Mark
2023-10-24 22:50:21 +02:00
parent 94df757f0c
commit 1eee22bb4b
10 changed files with 370 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
pub mod get;
use std::{
eprintln,
io::{BufRead, BufReader, Read, Write},
net::{SocketAddr, TcpListener},
sync::{mpsc, Arc, Mutex},
@@ -51,6 +50,7 @@ pub enum Command {
RemoveArtist(ArtistId),
ModifyArtist(Artist),
InitComplete,
ErrorInfo(String, String),
}
impl Command {
pub fn send_to_server(self, db: &Database) -> Result<(), Self> {
@@ -106,7 +106,6 @@ pub fn run_server(
let command_sender = command_sender.clone();
let db = Arc::clone(&db);
thread::spawn(move || {
eprintln!("[info] TCP connection accepted from {con_addr}.");
// each connection first has to send one line to tell us what it wants
let mut connection = BufReader::new(connection);
let mut line = String::new();
@@ -279,6 +278,11 @@ impl ToFromBytes for Command {
Self::InitComplete => {
s.write_all(&[0b00110001])?;
}
Self::ErrorInfo(t, d) => {
s.write_all(&[0b11011011])?;
t.to_bytes(s)?;
d.to_bytes(s)?;
}
}
Ok(())
}
@@ -324,6 +328,7 @@ impl ToFromBytes for Command {
0b11011100 => Self::RemoveArtist(ToFromBytes::from_bytes(s)?),
0b01011101 => Self::AddCover(ToFromBytes::from_bytes(s)?),
0b00110001 => Self::InitComplete,
0b11011011 => Self::ErrorInfo(ToFromBytes::from_bytes(s)?, ToFromBytes::from_bytes(s)?),
_ => {
eprintln!("unexpected byte when reading command; stopping playback.");
Self::Stop