mirror of
https://github.com/storytold/effectcraft.git
synced 2026-11-16 15:22:43 +00:00
Merge pull request #3776 from FredApps/onee/i786-psd-cutover-followup
psd: parse linked files with craft-psd and pin past #1845
This commit is contained in:
3 files changed
+8
-51
No files matched your search
Generated
+1
-1
@@ -1359,7 +1359,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "craft-psd"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87#5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=e836b6fd893eca3fbe5880f000dbf446c3a32fcc#e836b6fd893eca3fbe5880f000dbf446c3a32fcc"
|
||||
dependencies = [
|
||||
"encoding_rs",
|
||||
"flate2",
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@ craft-dpx = { version = "0.1.0", git = "https://github.com/storytold/craft-libs"
|
||||
craft-ps = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "808730f49b9637b7909fe2ae56f9d63fdb100cae", default-features = false, features = ["read"] }
|
||||
craft-exr = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" }
|
||||
craft-gif = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" }
|
||||
craft-psd = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" }
|
||||
craft-psd = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "e836b6fd893eca3fbe5880f000dbf446c3a32fcc" }
|
||||
craft-svg = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" }
|
||||
craft-webp = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" }
|
||||
craft-lottie = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" }
|
||||
|
||||
+6
-49
@@ -128,55 +128,12 @@ impl Psd {
|
||||
/// Linked layer data records (spec: "Linked Layer"): length, kind (`liFD` embedded data,
|
||||
/// `liFE` external file, `liFA` alias), version, unique id, original file name, type,
|
||||
/// creator, data length, optional descriptors, then the data. A damaged record ends the list.
|
||||
/// Ranges in [`LinkedFile::data`] are in the document bytes (`self.data`); craft-psd reports
|
||||
/// them relative to the block, so the block's start is added back.
|
||||
fn linked_files(&mut self, data: &[u8], start: usize, end: usize) {
|
||||
let mut pos = start;
|
||||
while pos + 8 <= end {
|
||||
let mut r = Reader::at(&data[..end], pos);
|
||||
let Ok(len) = r.u64() else { break };
|
||||
let body = r.pos;
|
||||
let Some(rec_end) = body.checked_add(len as usize).filter(|e| *e <= end) else { break };
|
||||
let mut r = Reader::at(&data[..rec_end], body);
|
||||
let rec = (|| -> Result<LinkedFile> {
|
||||
let kind = r.tag()?;
|
||||
let version = r.u32()?;
|
||||
let n = r.u8()? as usize;
|
||||
let uuid = String::from_utf8_lossy(r.bytes(n)?).into_owned();
|
||||
let name = descriptor::read_unicode(&mut r)?;
|
||||
let file_type = String::from_utf8_lossy(&r.tag()?).trim().to_string();
|
||||
let _creator = r.tag()?;
|
||||
let dlen = r.u64()? as usize;
|
||||
if r.u8()? != 0 {
|
||||
let _v = r.u32()?;
|
||||
descriptor::read_descriptor(&mut r)?;
|
||||
}
|
||||
let mut out = LinkedFile { uuid, name, file_type, data: None };
|
||||
match &kind {
|
||||
b"liFD" => {
|
||||
let s = r.pos;
|
||||
r.skip(dlen)?;
|
||||
out.data = Some(s..s + dlen);
|
||||
}
|
||||
b"liFE" => {
|
||||
let _v = r.u32()?;
|
||||
descriptor::read_descriptor(&mut r)?;
|
||||
if version > 3 {
|
||||
r.skip(4 + 4 + 8)?;
|
||||
}
|
||||
let _size = r.u64()?;
|
||||
if version > 2 && r.remaining() >= dlen && dlen > 0 {
|
||||
let s = r.pos;
|
||||
out.data = Some(s..s + dlen);
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
Ok(out)
|
||||
})();
|
||||
match rec {
|
||||
Ok(f) => self.linked.push(f),
|
||||
Err(_) => break,
|
||||
}
|
||||
pos = rec_end.div_ceil(4) * 4;
|
||||
let Some(block) = data.get(start..end) else { return };
|
||||
for f in craft_psd::smart::linked_files(block) {
|
||||
self.linked.push(LinkedFile { uuid: f.uuid, name: f.name, file_type: f.file_type, data: f.data.map(|r| (start + r.start)..(start + r.end)) });
|
||||
}
|
||||
}
|
||||
|
||||
@@ -429,7 +386,7 @@ fn flattened(data: &[u8]) -> Option<(craft_psd::Header, Vec<u8>, usize)> {
|
||||
|
||||
/// Linked-file blocks can be most of a file: leave them in the source, read in place.
|
||||
fn linked(key: &[u8; 4], _len: u64) -> bool {
|
||||
matches!(key, b"lnk2" | b"lnkD" | b"lnk3" | b"lnkE")
|
||||
craft_psd::smart::is_linked_layer_key(key)
|
||||
}
|
||||
|
||||
/// Reads `data` with craft-psd. Where that loses what the old reader kept, it reads a copy with
|
||||
|
||||
Reference in new issue
Block a user