fix: preserve scene identifier while decoding native preset versions

这个提交包含在:
mac 于 2026-11-05 04:25:33 +08:00 提交
1 父节点 606544820f
当前提交 a6910ebff4
2 个文件已更改
+11 -5

没有与搜索条件相匹配的文件

@@ -83,7 +83,7 @@ def read_collection(data):
raise ValueError('Too many native versions')
if stream.integer() != 5:
raise ValueError('Expected native preset-version format 5')
name, identifier, color = stream.text(), stream.text(), stream.text()
name, version_id, color = stream.text(), stream.text(), stream.text()
active = stream.flag()
stack, stack_reference = stream.storage_data()
masks, masks_reference = stream.storage_data()
@@ -99,7 +99,7 @@ def read_collection(data):
scene = decode_archive(archive)
if not isinstance(scene, dict):
raise ValueError('Expected native tracker-scene dictionary')
versions.append({'index': len(versions), 'name': name, 'id': identifier,
versions.append({'index': len(versions), 'name': name, 'id': version_id,
'preset': preset, 'tags': tags, 'active': active,
'colorSpace': color,
'stackInline': stack is not None,
@@ -148,7 +148,7 @@ def self_test():
return binary(value.encode())
archive = plistlib.dumps({'$archiver': 'NSKeyedArchiver', '$version': 100000,
'$objects': ['$null', {'nodes': [
'$objects': ['$null', {'identifier': 'scene-id', 'aspectRatio': 16 / 9, 'nodes': [
{'position': {'value': [.25, .75], 'keyFrames': []},
'rotation': {'value': 0, 'keyFrames': []},
'scale': {'value': [1, 1], 'keyFrames': []}}]}],
@@ -160,6 +160,8 @@ def self_test():
payload = prefix + integer(1) + integer(1) + binary(archive)
result = read_collection(payload)
assert result['maskCount'] == 1 and result['keyCount'] == 0
assert result['versions'][0]['sceneID'] == 'scene-id'
assert result['versions'][0]['aspectRatio'] == 16 / 9
assert result['versions'][0]['masks'][0]['position']['staticValue'] == [.25, .75]
invalid = [payload[:-1], payload + b'x', b'\x05' + payload[1:],
prefix + integer(1) + integer(0) + bytes(32)]
@@ -1,5 +1,5 @@
{
"date": "2026-11-04T20:24:24.188672+00:00",
"date": "2026-11-04T20:25:28.994812+00:00",
"passResult": true,
"readers": [
{
@@ -32,5 +32,9 @@
"ft_objects": 0,
"ft_objectversions": 0
},
"blocker": "Mac remains locked; native host verification and generation of original QA tracks require manual unlock."
"blocker": "Mac remains locked; native host verification and generation of original QA tracks require manual unlock.",
"readerFilesSHA256": {
"read_colorfinale_preset.py": "41c6d0b4b75fc018bb48fe47856e153f2957d030f30edf7769ac304c243a0559",
"read_colorfinale_collection.py": "b8529ba75371b5f4ff9381d5f6045591ac3d2cb71051bb286d21776cdb1ab1d3"
}
}