feat: add ability to deserialise from json value

This commit is contained in:
Anna 2022-11-17 19:48:04 -05:00
parent 5cd81ff3f9
commit 598c806799
Signed by: anna
GPG Key ID: 0B391D8F06FCD9E0
1 changed files with 11 additions and 1 deletions

View File

@ -2,8 +2,8 @@ use std::io::{Read, Seek};
use serde::de::Error as _;
use serde::Deserialize;
use serde_json::{Deserializer, StreamDeserializer};
use serde_json::de::IoRead;
use serde_json::StreamDeserializer;
pub use zip::{read::ZipFile, ZipArchive};
use crate::error::{Error, Result};
@ -15,6 +15,16 @@ pub mod error;
pub(crate) mod tracking_reader;
pub mod ttmp_extractor;
pub fn from_value(value: serde_json::Value) -> Result<ManifestKind> {
let manifest = if value.is_array() {
ManifestKind::V1(serde_json::from_value(value).map_err(Error::InvalidManifest)?)
} else {
ManifestKind::V2(serde_json::from_value(value).map_err(Error::InvalidManifest)?)
};
Ok(manifest)
}
pub fn from_reader<R: Read + Seek>(reader: R) -> Result<(ManifestKind, ZipArchive<R>)> {
let mut zip = ZipArchive::new(reader).map_err(Error::Zip)?;
let manifest = zip.by_name("TTMPL.mpl").map_err(Error::Zip)?;