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

0.1.23 upd

Browse Source
This commit is contained in:
Michael Wain 2025-02-15 19:42:20 +03:00
parent b0f0ec08db
commit 18c077439c
3 changed files with 18 additions and 9 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.22" version = "0.1.23"
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.22" version = "0.1.23"
edition = "2021" edition = "2021"
authors = ["alterwain"] authors = ["alterwain"]

23
src/artworkdb.rs
View File

@ -1,7 +1,7 @@
pub mod deserializer { pub mod deserializer {
use log::info; use log::info;
use crate::artworkdb::aobjects::{ADataSet, ADatabase, AImageItem, ASomeList}; use crate::artworkdb::aobjects::{ADataSet, ADatabase, AImageArg, AImageItem, ASomeList};
use crate::artworkdb::objects::{ChunkHeader, ChunkType, DataSet, Database, ImageItem, ImageName}; use crate::artworkdb::objects::{ChunkHeader, ChunkType, DataSet, Database, ImageItem, ImageName, LocationTag};
enum ChunkState { enum ChunkState {
Header, Header,
@ -50,19 +50,22 @@ 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();
if let ASomeList::Images(images) = &mut adb.find_dataset(1).child { if let ASomeList::Images(images) = &mut adb.find_dataset(1).child {
images.push(AImageItem { data: ai, name: None }); 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;
info!("Location tag"); let ds: LocationTag = bincode::deserialize(&data[i..i + u]).unwrap();
if let ASomeList::Images(images) = &mut adb.find_dataset(1).child {
images.last_mut().unwrap().args.push(AImageArg::Location(ds));
}
}, },
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 { if let ASomeList::Images(images) = &mut adb.find_dataset(1).child {
images.last_mut().unwrap().name = Some(ds); images.last_mut().unwrap().args.push(AImageArg::Name(ds));
} }
}, },
_ => { u = 1; info!("Unknown stuff happened"); } _ => { u = 1; info!("Unknown stuff happened"); }
@ -78,7 +81,7 @@ pub mod deserializer {
} }
pub mod aobjects { pub mod aobjects {
use crate::artworkdb::objects::{ChunkHeader, DataSet, Database, ImageItem, ImageName}; use crate::artworkdb::objects::{ChunkHeader, DataSet, Database, ImageItem, ImageName, LocationTag};
#[derive(Debug, serde::Serialize)] #[derive(Debug, serde::Serialize)]
pub struct ADatabase { pub struct ADatabase {
@ -110,7 +113,13 @@ pub mod aobjects {
#[derive(Debug, serde::Serialize)] #[derive(Debug, serde::Serialize)]
pub struct AImageItem { pub struct AImageItem {
pub data: ImageItem, pub data: ImageItem,
pub name: Option<ImageName>, pub args: Vec<AImageArg>,
}
#[derive(Debug, serde::Serialize)]
pub enum AImageArg {
Name(ImageName),
Location(LocationTag)
} }
} }