0.1.41 upd
This commit is contained in:
parent
11199ca042
commit
1ed9aae9f6
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "itunesdb"
|
||||
version = "0.1.40"
|
||||
version = "0.1.41"
|
||||
edition = "2021"
|
||||
authors = ["alterwain"]
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
pub mod deserializer {
|
||||
use log::info;
|
||||
use crate::artworkdb::aobjects::{ADataSet, ADatabase, AImageItem, ALocationTag};
|
||||
use crate::artworkdb::aobjects::{ADataSet, ADatabase, AImageItem, AImageName, SecondTypeTag, ThirdTypeTag};
|
||||
use crate::artworkdb::objects::{ChunkHeader, ChunkType, DataSet, Database, ImageFile, ImageItem, ImageName, LocationTag};
|
||||
|
||||
enum ChunkState {
|
||||
@ -47,13 +47,13 @@ pub mod deserializer {
|
||||
u = usize::try_from(header.end_of_chunk).unwrap() - 12;
|
||||
let ai: ImageItem = bincode::deserialize(&data[i..i+u]).unwrap();
|
||||
let images = &mut adb.find_dataset(last_type).child;
|
||||
images.push(AImageItem { data: Some((ai, None)), file: None, args: Vec::new() });
|
||||
images.push(AImageItem { data: Some(ai), tag: None, file: None });
|
||||
},
|
||||
ChunkType::FileImage => {
|
||||
u = usize::try_from(header.end_of_chunk).unwrap() - 12;
|
||||
let ai: ImageFile = bincode::deserialize(&data[i..i+u]).unwrap();
|
||||
let images = &mut adb.find_dataset(last_type).child;
|
||||
images.push(AImageItem { data: None, file: Some(ai), args: Vec::new() });
|
||||
images.push(AImageItem { data: None, tag: None, file: Some(ai) });
|
||||
},
|
||||
ChunkType::LocationTag => {
|
||||
u = usize::try_from(header.end_of_chunk).unwrap() - 12;
|
||||
@ -73,11 +73,10 @@ pub mod deserializer {
|
||||
let g = String::from_utf16(&bytes).unwrap();
|
||||
info!("str: {}", g);
|
||||
str = Some(g);
|
||||
let o = images.last_mut().unwrap().data.as_mut().unwrap();
|
||||
o.1 = Some(ALocationTag { data: ds, str, child: None });
|
||||
images.last_mut().unwrap().tag.as_mut().unwrap().child.as_mut().unwrap().tag = Some(ThirdTypeTag { data: ds, str });
|
||||
},
|
||||
2 => {
|
||||
images.last_mut().unwrap().args.push(ALocationTag { data: ds, str, child: None });
|
||||
images.last_mut().unwrap().tag = Some(SecondTypeTag { data: ds, str, child: None });
|
||||
},
|
||||
_ => { u = usize::try_from(header.children_count).unwrap() - 12; }
|
||||
}
|
||||
@ -87,7 +86,7 @@ pub mod deserializer {
|
||||
u = usize::try_from(header.end_of_chunk).unwrap() - 12;
|
||||
let ds: ImageName = bincode::deserialize(&data[i..i + u]).unwrap();
|
||||
let images = &mut adb.find_dataset(last_type).child;
|
||||
images.last_mut().unwrap().args.last_mut().unwrap().child = Some(ds);
|
||||
images.last_mut().unwrap().tag.as_mut().unwrap().child = Some(AImageName { iname: ds, tag: None });
|
||||
},
|
||||
_ => { u = 1; info!("Unknown stuff happened {:X?}", header.chunk_type.to_vec()); }
|
||||
}
|
||||
@ -119,41 +118,36 @@ pub mod serializer {
|
||||
} // Image List
|
||||
_ => { info!("Unknown data_set type!"); }
|
||||
}
|
||||
|
||||
|
||||
for img in data_set.child.iter() {
|
||||
let mut args = Vec::new();
|
||||
for arg in img.args.iter() {
|
||||
let mut argv = Vec::new();
|
||||
match arg.data.tag_type {
|
||||
2 => {
|
||||
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 data);
|
||||
},
|
||||
_ => {
|
||||
info!("Other datatype found!");
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(name) = &arg.child {
|
||||
args.append(&mut generate_header(ChunkType::ImageName, 76, argv.len()));
|
||||
args.append(&mut bincode::serialize(name).unwrap());
|
||||
}
|
||||
|
||||
args.append(&mut argv);
|
||||
}
|
||||
|
||||
if img.data.is_some() {
|
||||
let mut item = Vec::new();
|
||||
item.append(&mut generate_header(ChunkType::ImageItem, 40, args.len()));
|
||||
item.append(&mut bincode::serialize(&img.data.as_ref().unwrap().0).unwrap());
|
||||
item.append(&mut generate_header(ChunkType::ImageItem, 140, args.len()));
|
||||
item.append(&mut bincode::serialize(img.data.as_ref().unwrap()).unwrap());
|
||||
item.append(&mut [0; 100].to_vec());
|
||||
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);
|
||||
let o = img.tag.as_ref().unwrap();
|
||||
if o.data.tag_type == 2 {
|
||||
let mut data = [2u32.to_le_bytes(), 0u32.to_le_bytes(), 0u32.to_le_bytes()].concat();
|
||||
entry_bytes.append(&mut generate_header(ChunkType::LocationTag, 12, 0));
|
||||
entry_bytes.append(&mut data);
|
||||
|
||||
if let Some(name) = &o.child {
|
||||
|
||||
let mut nb = Vec::new();
|
||||
|
||||
let arg = name.tag.as_ref().unwrap();
|
||||
if arg.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();
|
||||
nb.append(&mut generate_header(ChunkType::LocationTag, 12, str_b.len()));
|
||||
nb.append(&mut str_b);
|
||||
}
|
||||
|
||||
args.append(&mut generate_header(ChunkType::ImageName, 76, nb.len()));
|
||||
args.append(&mut bincode::serialize(name).unwrap());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -168,7 +162,7 @@ pub mod serializer {
|
||||
bytes.append(&mut generate_header(ChunkType::DataSet, 84, entry_bytes.len()));
|
||||
bytes.append(&mut bincode::serialize(&data_set.data).unwrap());
|
||||
bytes.append(&mut [0; 80].to_vec());
|
||||
|
||||
|
||||
bytes.append(&mut entry_bytes);
|
||||
}
|
||||
|
||||
@ -217,16 +211,28 @@ pub mod aobjects {
|
||||
|
||||
#[derive(Debug, serde::Serialize)]
|
||||
pub struct AImageItem {
|
||||
pub data: Option<(ImageItem, Option<ALocationTag>)>,
|
||||
pub tag: Option<SecondTypeTag>,
|
||||
pub data: Option<ImageItem>,
|
||||
pub file: Option<ImageFile>,
|
||||
pub args: Vec<ALocationTag>,
|
||||
}
|
||||
|
||||
#[derive(Debug, serde::Serialize)]
|
||||
pub struct AImageName {
|
||||
pub iname: ImageName,
|
||||
pub tag: Option<ThirdTypeTag>,
|
||||
}
|
||||
|
||||
#[derive(Debug, serde::Serialize)]
|
||||
pub struct ALocationTag {
|
||||
pub struct SecondTypeTag {
|
||||
pub data: LocationTag,
|
||||
pub str: Option<String>,
|
||||
pub child: Option<ImageName>
|
||||
pub child: Option<AImageName>
|
||||
}
|
||||
|
||||
#[derive(Debug, serde::Serialize)]
|
||||
pub struct ThirdTypeTag {
|
||||
pub data: LocationTag,
|
||||
pub str: Option<String>
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user