From 5000d24a77b841b764d599e1c5d8fdb1175039f3 Mon Sep 17 00:00:00 2001 From: G2-Games Date: Mon, 11 Dec 2023 02:30:03 -0600 Subject: [PATCH] Fixed errors in foobar reader --- src/lib.rs | 1 + src/music_storage/db_reader/foobar/reader.rs | 6 +++--- src/music_storage/db_reader/foobar/utils.rs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 9981527..c20df16 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,6 +6,7 @@ pub mod music_storage { pub mod db_reader { pub mod foobar { pub mod reader; + pub mod utils; } pub mod musicbee { pub mod reader; diff --git a/src/music_storage/db_reader/foobar/reader.rs b/src/music_storage/db_reader/foobar/reader.rs index 23872b0..165c08b 100644 --- a/src/music_storage/db_reader/foobar/reader.rs +++ b/src/music_storage/db_reader/foobar/reader.rs @@ -36,7 +36,7 @@ impl ExternalLibrary for FoobarPlaylist { } let meta_size = i32::from_le_bytes(get_bytes(&mut buf_iter)) as usize; - let metadata = get_bytes_vec(&mut buf_iter, meta_size); + let metadata = &get_bytes_vec(&mut buf_iter, meta_size); let track_count = i32::from_le_bytes(get_bytes(&mut buf_iter)); // Read all the track fields @@ -135,7 +135,7 @@ impl ExternalLibrary for FoobarPlaylist { Self { songs: retrieved_songs, - metadata, + metadata: metadata.clone(), } } @@ -161,7 +161,7 @@ pub struct FoobarPlaylistTrack { impl FoobarPlaylistTrack { fn find_song(&self) -> Song { - let location = URI::Local(self.file_name.into()); + let location = URI::Local(self.file_name.clone().into()); Song { location, diff --git a/src/music_storage/db_reader/foobar/utils.rs b/src/music_storage/db_reader/foobar/utils.rs index 62ee270..4b02f02 100644 --- a/src/music_storage/db_reader/foobar/utils.rs +++ b/src/music_storage/db_reader/foobar/utils.rs @@ -1,4 +1,4 @@ -pub fn meta_offset(metadata: Vec, offset: usize) -> String { +pub fn meta_offset(metadata: &Vec, offset: usize) -> String { let mut result_vec = Vec::new(); let mut i = offset;