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

0.1.32 upd

Browse Source
This commit is contained in:
Michael Wain 2025-02-15 23:39:56 +03:00
parent 32e5e37dd3
commit 50c6194a79
3 changed files with 23 additions and 35 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.30" version = "0.1.32"
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.31" version = "0.1.32"
edition = "2021" edition = "2021"
authors = ["alterwain"] authors = ["alterwain"]

54
src/artworkdb.rs
View File

@ -1,6 +1,6 @@
pub mod deserializer { pub mod deserializer {
use log::info; use log::info;
use crate::artworkdb::aobjects::{ADataSet, ADatabase, AImageItem, ALocationTag, ASomeList}; use crate::artworkdb::aobjects::{ADataSet, ADatabase, AImageItem, ALocationTag};
use crate::artworkdb::objects::{ChunkHeader, ChunkType, DataSet, Database, ImageItem, ImageName, LocationTag}; use crate::artworkdb::objects::{ChunkHeader, ChunkType, DataSet, Database, ImageItem, ImageName, LocationTag};
enum ChunkState { enum ChunkState {
@ -37,9 +37,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 ds: DataSet = bincode::deserialize(&data[i..i + u]).unwrap(); let ds: DataSet = bincode::deserialize(&data[i..i + u]).unwrap();
last_type = ds.data_type; last_type = ds.data_type;
adb.children.push(ADataSet { header, data: ds, child: match ds.data_type { adb.children.push(ADataSet { header, data: ds, child: Vec::new()});
_ => ASomeList::Images(Vec::new()), // 1
}});
}, },
ChunkType::ImageList => { ChunkType::ImageList => {
info!("ImageList tag"); info!("ImageList tag");
@ -49,38 +47,35 @@ pub mod deserializer {
info!("ImageItem tag"); info!("ImageItem tag");
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();
if let ASomeList::Images(images) = &mut adb.find_dataset(1).child { let images = &mut adb.find_dataset(last_type).child;
images.push(AImageItem { data: ai, args: Vec::new() }); images.push(AImageItem { data: ai, args: Vec::new() });
}
}, },
ChunkType::LocationTag => { ChunkType::LocationTag => {
u = usize::try_from(header.end_of_chunk).unwrap() - 12; u = usize::try_from(header.end_of_chunk).unwrap() - 12;
let ds: LocationTag = bincode::deserialize(&data[i..i + u]).unwrap(); let ds: LocationTag = bincode::deserialize(&data[i..i + u]).unwrap();
if let ASomeList::Images(images) = &mut adb.find_dataset(1).child { let images = &mut adb.find_dataset(last_type).child;
let mut str = None; let mut str = None;
if ds.tag_type == 3 { if ds.tag_type == 3 {
let mut bytes = Vec::new(); let mut bytes = Vec::new();
let str_end = u32::from_le_bytes(data[i+12..i+16].try_into().unwrap()) as usize; let str_end = u32::from_le_bytes(data[i+12..i+16].try_into().unwrap()) as usize;
let mut h = i+24; let mut h = i+24;
u += 12 + str_end; u += 12 + str_end;
while h < i+24+str_end { while h < i+24+str_end {
bytes.push(u16::from_le_bytes(data[h..h+2].try_into().unwrap())); bytes.push(u16::from_le_bytes(data[h..h+2].try_into().unwrap()));
h+=2; h+=2;
}
let g = String::from_utf16(&bytes).unwrap();
info!("str: {}", g);
str = Some(g);
} }
images.last_mut().unwrap().args.push(ALocationTag { data: ds, str, child: None }); let g = String::from_utf16(&bytes).unwrap();
info!("str: {}", g);
str = Some(g);
} }
images.last_mut().unwrap().args.push(ALocationTag { data: ds, str, child: None });
}, },
ChunkType::ImageName => { ChunkType::ImageName => {
info!("ImageName tag"); info!("ImageName tag");
u = usize::try_from(header.end_of_chunk).unwrap() - 12; u = usize::try_from(header.end_of_chunk).unwrap() - 12;
let ds: ImageName = bincode::deserialize(&data[i..i + u]).unwrap(); let ds: ImageName = bincode::deserialize(&data[i..i + u]).unwrap();
if let ASomeList::Images(images) = &mut adb.find_dataset(1).child { let images = &mut adb.find_dataset(last_type).child;
images.last_mut().unwrap().args.last_mut().unwrap().child = Some(ds); images.last_mut().unwrap().args.last_mut().unwrap().child = Some(ds);
}
}, },
_ => { u = 1; info!("Unknown stuff happened"); } _ => { u = 1; info!("Unknown stuff happened"); }
} }
@ -114,14 +109,7 @@ pub mod aobjects {
pub struct ADataSet { pub struct ADataSet {
pub header: ChunkHeader, pub header: ChunkHeader,
pub data: DataSet, pub data: DataSet,
pub child: ASomeList pub child: Vec<AImageItem>
}
#[derive(Debug, serde::Serialize)]
pub enum ASomeList {
Images(Vec<AImageItem>), // 1
Albums, // 2
Files, // 3
} }
#[derive(Debug, serde::Serialize)] #[derive(Debug, serde::Serialize)]