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

bugfix, musicdb-find_and_add_missing_songs tests

Browse Source
This commit is contained in:
Mark
2024-08-26 20:55:30 +02:00
parent 9f12c2e80a
commit 1708fa9a90
10 changed files with 1138 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -248,7 +248,7 @@ impl Display for Song {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", self.title)?;
match self.album {
Some(album) => write!(f, " (by {} on {album})", self.artist)?,
Some(album) => write!(f, " ({} by {} on {album})", self.id, self.artist)?,
None => write!(f, " (by {})", self.artist)?,
}
Ok(())

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

@@ -133,26 +133,35 @@ impl<T: Write + Read> Client<T> {
len_line[1..].trim()
);
} else {
let mut read_list = || -> std::io::Result<Result<Vec<String>, String>> {
if len_line.starts_with("len: ") {
if let Ok(len) = len_line[4..].trim().parse() {
let mut out = Vec::with_capacity(len);
for _ in 0..len {
let mut line = String::new();
self.0.read_line(&mut line)?;
let line = line.trim_end_matches(['\n', '\r']);
out.push(line.trim().to_owned());
}
Ok(Ok(out))
let len_line = len_line.to_owned();
let mut read_list =
|l: Option<String>| -> std::io::Result<Result<Vec<String>, String>> {
let len_line = if let Some(l) = &l {
l.as_str()
} else {
Ok(Err(format!("bad len in len-line: {len_line}")))
response.clear();
self.0.read_line(&mut response)?;
response.trim()
};
if len_line.starts_with("len: ") {
if let Ok(len) = len_line[4..].trim().parse() {
let mut out = Vec::with_capacity(len);
for _ in 0..len {
let mut line = String::new();
self.0.read_line(&mut line)?;
let line = line.trim_end_matches(['\n', '\r']);
out.push(line.trim().to_owned());
}
Ok(Ok(out))
} else {
Ok(Err(format!("bad len in len-line: {len_line}")))
}
} else {
Ok(Err(format!("bad len-line: {len_line}")))
}
} else {
Ok(Err(format!("bad len-line: {len_line}")))
}
};
};
break Ok(Ok((
match read_list()? {
match read_list(Some(len_line))? {
Ok(v) => match v
.into_iter()
.map(|v| v.trim().parse::<SongId>().map_err(|e| (v, e.to_string())))
@@ -165,7 +174,7 @@ impl<T: Write + Read> Client<T> {
},
Err(e) => return Ok(Err(e)),
},
match read_list()? {
match read_list(None)? {
Ok(v) => match v
.into_iter()
.map(|v| {
@@ -189,7 +198,7 @@ impl<T: Write + Read> Client<T> {
},
Err(e) => return Ok(Err(e)),
},
match read_list()? {
match read_list(None)? {
Ok(v) => match v
.into_iter()
.map(|v| v.trim().parse::<SongId>().map_err(|e| (v, e)))
@@ -202,7 +211,7 @@ impl<T: Write + Read> Client<T> {
},
Err(e) => return Ok(Err(e)),
},
match read_list()? {
match read_list(None)? {
Ok(v) => match v
.into_iter()
.map(|v| {