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

artist image support

Browse Source
This commit is contained in:
Mark
2023-11-12 20:52:24 +01:00
parent 671bf17c53
commit 55190d1943
19 changed files with 2387 additions and 2767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,7 +156,7 @@ impl Song {
match dlcon
.lock()
.unwrap()
.song_file(id, true)
.song_file(id)
.expect("problem with downloader connection...")
{
Ok(data) => Some(data),

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

@@ -35,18 +35,32 @@ impl<T: Write + Read> Client<T> {
Ok(Err(response))
}
}
pub fn song_file(
&mut self,
id: SongId,
blocking: bool,
) -> Result<Result<Vec<u8>, String>, std::io::Error> {
pub fn song_file(&mut self, id: SongId) -> Result<Result<Vec<u8>, String>, std::io::Error> {
writeln!(
self.0.get_mut(),
"{}",
con_get_encode_string(&format!(
"song-file{}\n{id}",
if blocking { "-blocking" } else { "" }
))
con_get_encode_string(&format!("song-file\n{id}",))
)?;
let mut response = String::new();
self.0.read_line(&mut response)?;
let response = con_get_decode_line(&response);
if response.starts_with("len: ") {
if let Ok(len) = response[4..].trim().parse() {
let mut bytes = vec![0; len];
self.0.read_exact(&mut bytes)?;
Ok(Ok(bytes))
} else {
Ok(Err(response))
}
} else {
Ok(Err(response))
}
}
pub fn custom_file(&mut self, path: &str) -> Result<Result<Vec<u8>, String>, std::io::Error> {
writeln!(
self.0.get_mut(),
"{}",
con_get_encode_string(&format!("custom-file\n{path}",))
)?;
let mut response = String::new();
self.0.read_line(&mut response)?;
@@ -128,7 +142,7 @@ pub fn handle_one_connection_as_get(
Some(None) => Some(db.lib_directory.clone()),
Some(Some(p)) => Some(p.clone()),
};
// check for malicious paths
// check for malicious paths [TODO: Improve]
if Path::new(path).is_absolute() {
parent = None;
}