fix: preserve scene identifier while decoding native preset versions
这个提交包含在:
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)]
|
||||
|
||||
在新工单中引用
屏蔽一个用户