alterwain/ITunesDB
alterwain/ITunesDB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.1.40 upd

Browse Source
This commit is contained in:
Michael Wain 2025-02-17 03:53:12 +03:00
parent c1a9f5608c
commit 11199ca042
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -90,7 +90,7 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
[[package]] [[package]]
name = "itunesdb" name = "itunesdb"
version = "0.1.38" version = "0.1.40"
dependencies = [ dependencies = [
"bincode", "bincode",
"env_logger", "env_logger",

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "itunesdb" name = "itunesdb"
version = "0.1.39" version = "0.1.40"
edition = "2021" edition = "2021"
authors = ["alterwain"] authors = ["alterwain"]

27
src/artworkdb.rs
View File

@ -47,7 +47,7 @@ pub mod deserializer {
u = usize::try_from(header.end_of_chunk).unwrap() - 12; u = usize::try_from(header.end_of_chunk).unwrap() - 12;
let ai: ImageItem = bincode::deserialize(&data[i..i+u]).unwrap(); let ai: ImageItem = bincode::deserialize(&data[i..i+u]).unwrap();
let images = &mut adb.find_dataset(last_type).child; let images = &mut adb.find_dataset(last_type).child;
images.push(AImageItem { data: Some(ai), file: None, args: Vec::new() }); images.push(AImageItem { data: Some((ai, None)), file: None, args: Vec::new() });
}, },
ChunkType::FileImage => { ChunkType::FileImage => {
u = usize::try_from(header.end_of_chunk).unwrap() - 12; u = usize::try_from(header.end_of_chunk).unwrap() - 12;
@ -73,7 +73,8 @@ pub mod deserializer {
let g = String::from_utf16(&bytes).unwrap(); let g = String::from_utf16(&bytes).unwrap();
info!("str: {}", g); info!("str: {}", g);
str = Some(g); str = Some(g);
images.last_mut().unwrap().args.push(ALocationTag { data: ds, str, child: None }); let o = images.last_mut().unwrap().data.as_mut().unwrap();
o.1 = Some(ALocationTag { data: ds, str, child: None });
}, },
2 => { 2 => {
images.last_mut().unwrap().args.push(ALocationTag { data: ds, str, child: None }); images.last_mut().unwrap().args.push(ALocationTag { data: ds, str, child: None });
@ -114,8 +115,7 @@ pub mod serializer {
match data_set.data.data_type { match data_set.data.data_type {
1 => { 1 => {
entry_bytes.append(&mut generate_header_raw(ChunkType::ImageList, 80, data_set.child.len())); entry_bytes.append(&mut generate_header_raw(ChunkType::ImageList, 80, data_set.child.len()));
entry_bytes.append(&mut 1u32.to_le_bytes().to_vec()); entry_bytes.append(&mut [0; 80].to_vec());
entry_bytes.append(&mut [0; 76].to_vec());
} // Image List } // Image List
_ => { info!("Unknown data_set type!"); } _ => { info!("Unknown data_set type!"); }
} }
@ -125,12 +125,6 @@ pub mod serializer {
for arg in img.args.iter() { for arg in img.args.iter() {
let mut argv = Vec::new(); let mut argv = Vec::new();
match arg.data.tag_type { match arg.data.tag_type {
3 => {
let mut str_b = string_to_ipod16(arg.str.as_ref().unwrap());
str_b = [3u32.to_le_bytes().to_vec(), 0u32.to_le_bytes().to_vec(), 0u32.to_le_bytes().to_vec(), (str_b.len() as u32).to_le_bytes().to_vec(), 2u32.to_le_bytes().to_vec(), 0u32.to_le_bytes().to_vec(), str_b ].concat();
argv.append(&mut generate_header(ChunkType::LocationTag, 12, str_b.len()));
argv.append(&mut str_b);
},
2 => { 2 => {
let mut data = [2u32.to_le_bytes(), 0u32.to_le_bytes(), 0u32.to_le_bytes()].concat(); let mut data = [2u32.to_le_bytes(), 0u32.to_le_bytes(), 0u32.to_le_bytes()].concat();
argv.append(&mut generate_header(ChunkType::LocationTag, 12, 0)); argv.append(&mut generate_header(ChunkType::LocationTag, 12, 0));
@ -152,8 +146,15 @@ pub mod serializer {
if img.data.is_some() { if img.data.is_some() {
let mut item = Vec::new(); let mut item = Vec::new();
item.append(&mut generate_header(ChunkType::ImageItem, 40, args.len())); item.append(&mut generate_header(ChunkType::ImageItem, 40, args.len()));
item.append(&mut bincode::serialize(img.data.as_ref().unwrap()).unwrap()); item.append(&mut bincode::serialize(&img.data.as_ref().unwrap().0).unwrap());
entry_bytes.append(&mut item); entry_bytes.append(&mut item);
let o = img.data.as_ref().unwrap().1.as_ref().unwrap();
if o.data.tag_type == 3 {
let mut str_b = string_to_ipod16(o.str.as_ref().unwrap());
str_b = [3u32.to_le_bytes().to_vec(), 0u32.to_le_bytes().to_vec(), 0u32.to_le_bytes().to_vec(), (str_b.len() as u32).to_le_bytes().to_vec(), 2u32.to_le_bytes().to_vec(), 0u32.to_le_bytes().to_vec(), str_b ].concat();
entry_bytes.append(&mut generate_header(ChunkType::LocationTag, 12, str_b.len()));
entry_bytes.append(&mut str_b);
}
} }
if img.file.is_some() { if img.file.is_some() {
@ -165,8 +166,8 @@ pub mod serializer {
} }
bytes.append(&mut generate_header(ChunkType::DataSet, 84, entry_bytes.len())); bytes.append(&mut generate_header(ChunkType::DataSet, 84, entry_bytes.len()));
bytes.append(&mut [0; 80].to_vec());
bytes.append(&mut bincode::serialize(&data_set.data).unwrap()); bytes.append(&mut bincode::serialize(&data_set.data).unwrap());
bytes.append(&mut [0; 80].to_vec());
bytes.append(&mut entry_bytes); bytes.append(&mut entry_bytes);
} }
@ -216,7 +217,7 @@ pub mod aobjects {
#[derive(Debug, serde::Serialize)] #[derive(Debug, serde::Serialize)]
pub struct AImageItem { pub struct AImageItem {
pub data: Option<ImageItem>, pub data: Option<(ImageItem, Option<ALocationTag>)>,
pub file: Option<ImageFile>, pub file: Option<ImageFile>,
pub args: Vec<ALocationTag>, pub args: Vec<ALocationTag>,
} }