From b243751f867539b35aa51e7b62119499141f806b Mon Sep 17 00:00:00 2001 From: mac Date: Mon, 2 Nov 2026 14:50:17 +0800 Subject: [PATCH] Remove template author rows and adopt native 5.11 format for build36 --- research/PrintLooks1.6.0.md | 10 ++- template/README.md | 8 +- template/sources/Provenance.json | 24 ++++-- template/verification/Compatibility.json | 76 +++++++++++++++++++ template/verification/Files.sha256.json | 17 +++-- template/verification/SavedSelection.json | 12 +-- template/verification/SkillAudit.json | 25 +++--- template/verification/StaticContract.json | 24 ++---- template/大鱼调色.moef | 76 +------------------ tools/build_template.py | 43 +++++------ tools/deliver.py | 3 + tools/verify_template.py | 36 +++++++++ verification/PrintLooksBuild35Superseded.json | 20 +++++ 大鱼调色/Plugin/Info.plist | 2 +- 大鱼调色/Wrapper Application/Info.plist | 2 +- 15 files changed, 222 insertions(+), 156 deletions(-) create mode 100644 template/verification/Compatibility.json create mode 100644 tools/verify_template.py create mode 100644 verification/PrintLooksBuild35Superseded.json diff --git a/research/PrintLooks1.6.0.md b/research/PrintLooks1.6.0.md index 99b2d40..75064da 100644 --- a/research/PrintLooks1.6.0.md +++ b/research/PrintLooks1.6.0.md @@ -22,4 +22,12 @@ 透明度边界已单独取证:原版FTColorSpaceFilter将RGB当直色值转换,LMT processor则按预乘alpha读取。直接用fractional-alpha把两者串联不等于颜色函数,最大偏差3.975311214;八外观alpha=1颜色对照全部通过。32个保活转换filter身份互异,排除共享可变单例。对照工具完整保留原始链、每alpha分组及各中间图样本的诊断,不调整容差掩盖差异。正式算法采用原版alpha=1颜色函数并保持本产品的输入/输出预乘合同,透明像素保留、非透明像素显式解预乘/再预乘;这是有记录的适配,不声称原版Core Image直串在半透明时逐像素等效。 -当前准备正式交付;在此检查点正式安装仍为1.5.0,未把开发编译副本作为可见版本运行。 +当前准备正式交付;在此检查点正式安装仍为1.5.0,尚未开始正式宿主验收。 + +## 用户补充:去除模板版权与较低版本格式 + +用户截图要求去掉MOEF顶部作者和网站两行,并尽量兼容旧FCP。生成器已移除完整Rig、两个展示菜单、相关factory与发布项,仅保留自定义检查器和混合两个发布入口。按真实本机ColorFinale/Pro同结构模板,输出采用ozml5.11 / Motion5.4.5;移除本壳未使用的Object3DEnvironments、DRTSupport、onHDRDisplay和missingDynamicRangeType提示,内部factory/scenenode版本及色彩域不改。来源与schema边界见 `template/sources/Provenance.json`、`template/verification/Compatibility.json`。 + +全局技能检查器的5.11版本guard未知如实保留;项目级验证有真实5.11相同选择字段证据。只降低格式门槛,不据此承诺旧FCP实机通过,程序的Apple Silicon/macOS14.6依赖保持。 + +35候选已公证Accepted `3819fbc3-6b7d-4b89-b09a-3e5d9c0f0851` 并粘附,但宿主在替换前重开,交付安全门保留正式1.5.0未替换。用户截图显示1.6.0,随后发现PluginKit同时登记正式1.5和构建目录候选,说明宿主可能发现了构建副本;未将此计为正式验收。之后用户新增模板要求,候选35及提交ZIP已清理,不重新提交同一包。最终版本递增为1.6.0(36),包含新的模板和签名。`tools/deliver.py`现在会在Xcode构建后立刻移除构建副本的PluginKit登记,避免公证等待期间被宿主发现。该阶段的状态见 `verification/PrintLooksBuild35Superseded.json`。 diff --git a/template/README.md b/template/README.md index 41e145d..4b2e700 100644 --- a/template/README.md +++ b/template/README.md @@ -4,9 +4,9 @@ 正式安装目标:`~/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef`。插件依赖唯一正式位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主 Bundle ID `com.dayu.color`,滤镜 UUID `1C17B73B-F229-4C09-A434-EAF6DFF5F22A`。 -四个发布入口依次是用户技能要求的两个空绑定版权菜单、大鱼调色自定义检查器 `./9000`、宿主混合 `./10001`。检查器与 LUT 文件状态分别保存为 `DYInspectorToken`、`DYAssetState`;两个双重 NSKeyedArchive 由本工程的实际类和 Foundation 生成并回读验证。全部 196 个已注册原生浮点参数都在同一 filter 中保存,供自定义面板与宿主持久化访问。 +两个发布入口为大鱼调色自定义检查器 `./9000`、宿主混合 `./10001`。检查器、LUT 文件与工具蒙版状态分别保存为 `DYInspectorToken`、`DYAssetState`、`DYToolDocument`;原生 NSKeyedArchive 由本工程的实际类和 Foundation 生成并回读验证。全部278个已注册原生浮点参数都在同一 filter 中保存,供自定义面板与宿主持久化访问。 -版权结构保留完整原生 Rig 与两菜单:作者 ID `10081`、网站 ID `10082`,共同位于 Rig `10080`。菜单精确显示 `大鱼先森Media` 与 `dayu.media`,没有绑定任何画面通道。结构核验逐字段反向重编号对照原始 Rig。版本沿用技能原生效果器母版的 `5.13 / 5.6.7`,没有从较高版本参考传播顶层版本。 +按2026-11-02用户明确要求,删除作者和网址的两个展示菜单、Rig节点与相应发布项;生成器也停止添加这些内容,历史参考 `CopyrightRig.xml` 不再参与生成。模板顶层降为 `5.11 / 5.4.5`,有本机Color Finale同类EffectSource/FxPlug/custom参数真实样本作结构依据;移除较新且本壳未使用的3D/HDR编辑提示,保留原factory和场景节点内部版本、效果源及色彩设置。来源摘要见 `sources/Provenance.json`。这降低模板格式门槛,旧FCP仍受本程序Apple Silicon、macOS14.6及FxPlug/宿主API要求约束;未实机覆盖的版本不宣称兼容。 生成入口: @@ -16,6 +16,8 @@ python3 tools/build_template.py --output /绝对路径/大鱼调色.moef 工程模型有变更时,先审查变更,再加 `--refresh-model` 重新导出实际注册表与自有归档。它只编译并执行短时命令行元数据工具,仅用于本工程的参数元数据导出。既有输出必须明确加 `--overwrite`;普通重建直接复用版本化原始归档并核对模型源码哈希,以保持模板字节稳定。 -`verification/StaticContract.json`、`SavedSelection.json`、`SkillAudit.json` 记录当前落盘文件的静态检查:唯一滤镜、参数覆盖、四项发布、真实空绑定、无内容图层选中、源引用及无动画。实际 FCP 验收和导出记录见工程根目录 `verification/Host.json` 与 `HostThemeLUT.json`。 +`verification/StaticContract.json`、`SavedSelection.json`、`SkillAudit.json` 记录当前落盘文件的静态检查:唯一滤镜、参数覆盖、两项发布、无版权展示、无内容图层选中、源引用及无动画。实际 FCP 验收以工程根目录对应版本的宿主记录为准。 + +全局技能的选择状态检查器目前只接纳较新模板,对5.11返回版本guard未知;该原始结果保留在 `SkillAudit.json`,没有改写成技能工具通过。本项目以真实ColorFinalePro 5.11样本的相同字段和选择位建立 `tools/verify_template.py`,独立结果为 `verification/Compatibility.json`、`SavedSelection.json`;除版本guard外无其他结构错误。 `large.png`(640×360)与 `small.png`(240×135)使用本产品的光谱鱼和“大鱼调色”品牌图。原图和生成提示词在 `design/`,运行 `python3 tools/build_brand_assets.py` 可重建。`verification/Preview.json` 记录来源与导出哈希;正式安装时设置预览文件锁,防止宿主自动覆盖。 diff --git a/template/sources/Provenance.json b/template/sources/Provenance.json index a35c825..98a83e7 100644 --- a/template/sources/Provenance.json +++ b/template/sources/Provenance.json @@ -17,13 +17,22 @@ "feature": "two unbound copyright popup widgets", "path": "/Users/mac/.codex/skills/ae-to-motion/assets/publication/copyright-info/版权信息.moti", "sha256": "fd0e0414e957dbe1b5837250a38a4799defceedc0e09f7a6c7b9e1baf8b5e4c0", - "retained": "CopyrightRig.xml" + "retained": "CopyrightRig.xml (historical source only; no longer generated or shipped in the template)" } ], "versionPolicy": { - "ozml": "5.13", - "displayversion": "5.6.7", - "basis": "skill native effect source; no version value inferred from vendor or CST source" + "ozml": "5.11", + "displayversion": "5.4.5", + "basis": "Identity-verified local Color Finale EffectSource/FxPlug/custom-archive template; no vendor preset/archive copied", + "referenceTemplate": "~/Movies/Motion Templates.localized/Effects.localized/Color Finale/ColorFinale/ColorFinale.moef", + "referenceSHA256": "61b07cab981566dd4fd80f08fdcb9be9f26f3f0389062420dafc3331aaa95749", + "removedLaterOptionalHints": [ + "Object3DEnvironments", + "DRTSupport", + "onHDRDisplay", + "missingDynamicRangeType" + ], + "oldFCPActuallyTested": false }, "runtimeDependency": { "app": "/Library/Plug-Ins/FxPlug/大鱼调色.app", @@ -31,5 +40,10 @@ "pluginUUID": "1C17B73B-F229-4C09-A434-EAF6DFF5F22A", "noVendorRuntimeDependency": true }, - "scope": "Build sources and static evidence only; host UI/render/save-reopen validation remains separate" + "scope": "Build sources and static evidence only; host UI/render/save-reopen validation remains separate", + "copyrightPolicy": { + "userRequestedRemoval": true, + "publishedDisplayRows": 0, + "rigGenerated": false + } } diff --git a/template/verification/Compatibility.json b/template/verification/Compatibility.json new file mode 100644 index 0000000..a84403d --- /dev/null +++ b/template/verification/Compatibility.json @@ -0,0 +1,76 @@ +{ + "passed": true, + "sha256": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152", + "version": "5.11", + "displayversion": "5.4.5", + "nativeReference": { + "path": "~/Movies/Motion Templates.localized/Effects.localized/Color Finale/ColorFinalePro/ColorFinalePro.moef", + "sha256": "bfab9157b988acaf5c078a0837085843f2021e93a2e411eec9d94120f11ddd69", + "version": "5.11", + "displayversion": "5.4.5", + "projectBaseFlags": 268435473, + "currentObject": "10000", + "scenenodeVersion": "5", + "widgetBaseFlags": 16, + "layerAndSourceBaseFlags": 524304, + "fxPlugBaseFlags": 8589934608, + "allContentSelectionBits": 0 + }, + "staticContract": { + "passed": true, + "sha256": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152", + "version": "5.11", + "displayversion": "5.4.5", + "filterCount": 1, + "nativeFloatParameters": 278, + "customParameters": 3, + "publications": [ + { + "object": "10060", + "channel": "./9000", + "name": "大鱼调色" + }, + { + "object": "10060", + "channel": "./10001", + "name": "混合" + } + ], + "effectSourceType": 3, + "externalMediaRequired": false, + "placeholder": "native Drop Zone.tiff", + "animationObjects": 0, + "copyright": { + "removedAtUserRequest": true, + "publishedDisplayRows": 0, + "displayRigAbsent": true + }, + "savedSelection": { + "passed": true, + "selectedContentCount": 0, + "currentObjectIsProject": true + }, + "hostUIVerified": false, + "hostRenderVerified": false + }, + "savedSelection": { + "passed": true, + "sha256": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152", + "version": "5.11", + "selectionMask": "0x10000001", + "projectID": "10000", + "contentObjectsChecked": 4, + "selectedContent": [], + "selectedContentCount": 0, + "currentObject": "10000", + "currentObjectIsProject": true, + "nativeUIVerified": false, + "validator": "project-scoped native-5.11 field comparison", + "scope": "Saved fields only; no rendering or old-FCP execution" + }, + "skillCheckerStatus": "unsupported-version-guard; original SkillAudit.json retained unchanged", + "otherSkillStructuralErrors": [], + "copyrightDisplayRows": 0, + "oldFCPActuallyTested": false, + "scope": "Native-template structure and saved-state comparison only; FCP host acceptance is separate" +} diff --git a/template/verification/Files.sha256.json b/template/verification/Files.sha256.json index f5e16cf..da0867e 100644 --- a/template/verification/Files.sha256.json +++ b/template/verification/Files.sha256.json @@ -1,14 +1,15 @@ { - "README.md": "db063c6b56acf80eec8c17613539ce99202c9771d108f392c13cf90ed962a038", + "README.md": "6be40447052793855fba6f1a6756625d86da0363827ebb53e55c2980506ec987", "sources/CopyrightRig.xml": "842afc58ecda0fc8c22675a0191f53dccb9ea6aaba10acd0a272cecee9b72067", "sources/NativeEffectSource.moef": "4424b5ee3b5dc137bc8e8baa9091b24c2431adf32a3d79b2662cff079c35031c", "sources/NativeFactories.xml": "5db79ab22e948ca2bdf9162beb60d8380a95ceff6c74e86ff095804ae1d832b6", "sources/NativeFxPlugShell.xml": "5d2a1e807fb7148e5a682c83ba30d7022c8680d2ca8309c502d30f4b12efad64", - "sources/Provenance.json": "32063c48ef02a47e42555537421bfc95f767e96fc88d3478e9116c85a0205baf", - "sources/RegisteredParameters.json": "1d8c9c1a58c289d855e1f57add064dd4d96342961df6c2796f705a90b287e38c", - "tools/dump_model.mm": "2ef22e010e0cae15b73107d39fb2c125f6049b1e5405e88078f936cf29e79350", - "verification/SavedSelection.json": "ef90b0afa1df26f2a5d299f86f675422c8b433e3f833ff1a9a61bb1228e6c9ca", - "verification/SkillAudit.json": "d6931eb103fb1fe3e30a331b47ff957ef9d69cf409276d13a3f1bb423df5ad80", - "verification/StaticContract.json": "a03aa582320dff857f860a90c120b829604a8a3f2aa1997a5131b825b4fdbf1b", - "大鱼调色.moef": "bb03fae187e45358180258bb6a43fdde397b317dbf191bba5de72f2ce5d83b2b" + "sources/Provenance.json": "9cfa41fd1f02b35b99cad56a4a048bafa1c627da181006f5b9186a104664f421", + "sources/RegisteredParameters.json": "010627d22f8b8041d5787be0b2a57a27789c2ae9f5bc743df5d75212dc3e0008", + "tools/dump_model.mm": "04e04446aa351d774913bc25b06512fefe7969bdf4c6e471a91f1e9d6c4fc3b5", + "verification/SavedSelection.json": "d28a73af67af295b4b0201768c7d2d34ec5de56d7029d1fc3dc4a2d2e1bb5755", + "verification/SkillAudit.json": "d8d7d39263d9b1e9cb12d56bf0a7e007477f12ff49bd5230088d18c166d52c54", + "verification/StaticContract.json": "ef04830b5216ae4cf1e4987c08d055ffc0f4e2b820ce41dd3429975a9bf74386", + "大鱼调色.moef": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152", + "verification/Compatibility.json": "77bc5da2deab8567b0cc7e5006ea671662ccfb7ec7f73c00d2ca264534143304" } diff --git a/template/verification/SavedSelection.json b/template/verification/SavedSelection.json index 44e4a9f..19c4f4c 100644 --- a/template/verification/SavedSelection.json +++ b/template/verification/SavedSelection.json @@ -1,15 +1,15 @@ { "passed": true, - "sha256": "bb03fae187e45358180258bb6a43fdde397b317dbf191bba5de72f2ce5d83b2b", + "sha256": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152", + "version": "5.11", "selectionMask": "0x10000001", - "nativeUIVerified": false, - "scope": "Saved selection fields for observed schema; no rendering or GUI operation", - "version": "5.13", "projectID": "10000", - "contentObjectsChecked": 7, + "contentObjectsChecked": 4, "selectedContent": [], "selectedContentCount": 0, "currentObject": "10000", "currentObjectIsProject": true, - "errors": [] + "nativeUIVerified": false, + "validator": "project-scoped native-5.11 field comparison", + "scope": "Saved fields only; no rendering or old-FCP execution" } diff --git a/template/verification/SkillAudit.json b/template/verification/SkillAudit.json index 4ac1c7d..e425a50 100644 --- a/template/verification/SkillAudit.json +++ b/template/verification/SkillAudit.json @@ -1,6 +1,8 @@ { - "checksPassed": true, - "errors": [], + "checksPassed": false, + "errors": [ + "Saved selection: Unverified Motion XML version/schema; obtain native evidence first" + ], "warnings": [ "Parent time conversion is supplied explicitly in contracts; not inferred for arbitrary nesting.", "No native rendering, font/glyph availability, full dynamic/private reference graph, or visual validation performed." @@ -13,19 +15,14 @@ "NTSC": "1" }, "savedSelection": { - "passed": true, - "sha256": "bb03fae187e45358180258bb6a43fdde397b317dbf191bba5de72f2ce5d83b2b", + "passed": false, + "sha256": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152", "selectionMask": "0x10000001", "nativeUIVerified": false, "scope": "Saved selection fields for observed schema; no rendering or GUI operation", - "version": "5.13", - "projectID": "10000", - "contentObjectsChecked": 7, - "selectedContent": [], - "selectedContentCount": 0, - "currentObject": "10000", - "currentObjectIsProject": true, - "errors": [] + "errors": [ + "Unverified Motion XML version/schema; obtain native evidence first" + ] }, "savedSelectionRequired": true, "buildMarkers": false, @@ -48,10 +45,10 @@ "nativeVisualValidation": false }, "basic": { - "entity_count": 10, + "entity_count": 7, "entity_ids_unique": true, "duplicate_entities": {}, - "published_count": 4, + "published_count": 2, "unresolved_media": [] } } diff --git a/template/verification/StaticContract.json b/template/verification/StaticContract.json index d3b7a22..f3c16a3 100644 --- a/template/verification/StaticContract.json +++ b/template/verification/StaticContract.json @@ -1,22 +1,12 @@ { "passed": true, - "sha256": "44dbfef7b809352ccdb476da5cbe6c6ba9f1fe7a4d9ea53c6eaf7b5ddb798ad8", - "version": "5.13", - "displayversion": "5.6.7", + "sha256": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152", + "version": "5.11", + "displayversion": "5.4.5", "filterCount": 1, "nativeFloatParameters": 278, "customParameters": 3, "publications": [ - { - "object": "10081", - "channel": "./2/100", - "name": "FCP 版本作者→" - }, - { - "object": "10082", - "channel": "./2/100", - "name": "更多模板浏览器访问→" - }, { "object": "10060", "channel": "./9000", @@ -33,11 +23,9 @@ "placeholder": "native Drop Zone.tiff", "animationObjects": 0, "copyright": { - "passed": true, - "rig": "10080", - "author": "10081", - "site": "10082", - "unbound": true + "removedAtUserRequest": true, + "publishedDisplayRows": 0, + "displayRigAbsent": true }, "savedSelection": { "passed": true, diff --git a/template/大鱼调色.moef b/template/大鱼调色.moef index 6cd5e1e..99a3fc5 100644 --- a/template/大鱼调色.moef +++ b/template/大鱼调色.moef @@ -1,7 +1,7 @@ - - 5.6.7 + + 5.4.5 Channel Apple @@ -27,16 +27,6 @@ Apple 1 - - 绑定 - Apple - 1 - - - 小组件 - Apple - 1 - @@ -145,14 +135,9 @@ 0 3 0 - 100 - 0 - 0 2 - - @@ -186,62 +171,6 @@ - - - 2 - 3 - 0 - - 0 - 16 - - - - - - - - - - - - - - - - - - - 2 - 3 - 0 - - 0 - 16 - - - - - - - - - - - - - - - - - - 0 - - 0 - 16 - - - 1 @@ -629,7 +558,6 @@ 1200 1200 0.033333333333333333 - 0 1 0 diff --git a/tools/build_template.py b/tools/build_template.py index 4cbe95f..3d9d008 100644 --- a/tools/build_template.py +++ b/tools/build_template.py @@ -12,6 +12,8 @@ TEMPLATE=ROOT/'template' SOURCES=TEMPLATE/'sources' PROJECT_UUID='7d468273c013498e9806a0d7bc32fddf' PLUGIN_UUID='1C17B73B-F229-4C09-A434-EAF6DFF5F22A' +OUTPUT_VERSION='5.11' +OUTPUT_DISPLAY_VERSION='5.4.5' NATIVE_ALPHABET='*-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' STANDARD_ALPHABET='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/' CONTENT_TAGS={'scenenode','layer','group','filter','behavior','mask'} @@ -60,10 +62,17 @@ def build(model): scene=root.find('scene');project=scene.find('scenenode[@factoryID="4"]') source=scene.find('.//scenenode[@name="效果源"]') if source is None or root.get('version')!='5.13' or root.findtext('displayversion')!='5.6.7':raise ValueError('Unexpected native EffectSource source') + # Same EffectSource/FxPlug/custom-archive shape exists in the identity- + # recorded native 5.11 / Motion 5.4.5 reference. Drop only later optional + # 3D/HDR editor hints; keep factory/node versions and color settings intact. + root.set('version',OUTPUT_VERSION);root.find('displayversion').text=OUTPUT_DISPLAY_VERSION + for parent in root.iter(): + for child in list(parent): + if child.tag in {'Object3DEnvironments','DRTSupport','onHDRDisplay','missingDynamicRangeType'}:parent.remove(child) if source.find('parameter[@id="2"]/parameter[@id="321"]').get('value')!='3':raise ValueError('Expected native EffectSource type 3') native_factories=E.parse(SOURCES/'NativeFactories.xml').getroot() lookup={f.get('uuid'):f for f in native_factories} - factory_ids={'deca4859b16011d7a12d0003936f6f92':'5','402246385249454b90e08b2ee1b6bf06':'6','e35c74f01d5042f6b468eb530169bfb7':'7'} + factory_ids={'deca4859b16011d7a12d0003936f6f92':'5'} insert_at=list(root).index(root.findall('factory')[-1])+1 for uuid,fid in factory_ids.items(): factory=copy.deepcopy(lookup[uuid]);factory.set('id',fid);root.insert(insert_at,factory);insert_at+=1 @@ -87,17 +96,11 @@ def build(model): if node.get("id")=="10005":node.set("value","1");node.set("default","0");node.set("flags","8589934592") filt.append(node) source.append(filt) - copyright=E.parse(SOURCES/'CopyrightRig.xml').getroot() - entity_map={'3356608241':'10080','3356608243':'10081','3356608245':'10082'} - for node in copyright.iter('scenenode'): - node.set('id',entity_map[node.get('id')]);node.set('factoryID','6' if node.get('factoryID')=='1' else '7') - # Native Rig stays directly below scene, after its native project. - scene.insert(list(scene).index(project)+1,copyright) + # User requested removal of the author's two display-only Rig widgets. + # Do not regenerate their nodes, factories or published parameter rows. pub=scene.find('publishSettings') for node in list(pub): if node.tag!='version':pub.remove(node) - for object_id,name in [('10081','FCP 版本作者→'),('10082','更多模板浏览器访问→')]: - E.SubElement(pub,'target',object=object_id,channel='./2/100',name=name) E.SubElement(pub,'target',object='10060',channel='./9000',name='大鱼调色') E.SubElement(pub,'target',object='10060',channel='./10001',name='混合') current=scene.find('currentObject') @@ -116,6 +119,8 @@ def build(model): def verify(data,model): root=E.fromstring(data);scene=root.find('scene');factories={f.get('id'):f.get('uuid') for f in root.findall('factory')} + assert root.get('version')==OUTPUT_VERSION and root.findtext('displayversion')==OUTPUT_DISPLAY_VERSION + assert all(not list(root.iter(tag)) for tag in ['Object3DEnvironments','DRTSupport','onHDRDisplay','missingDynamicRangeType']) filters=root.findall('.//filter') assert len(filters)==1 and filters[0].get('pluginUUID')==PLUGIN_UUID f=filters[0];params={p.get('id'):p for p in f.findall('parameter')} @@ -134,24 +139,12 @@ def verify(data,model): if node.tag in CONTENT_TAGS and node is not project and node.find('baseFlags') is not None and int(node.findtext('baseFlags'))&0x10000001:selected.append(node.get('id')) assert not selected and scene.findtext('currentObject')==project.get('id') pub=scene.find('publishSettings').findall('target') - assert [(t.get('object'),t.get('channel'),t.get('name')) for t in pub]==[('10081','./2/100','FCP 版本作者→'),('10082','./2/100','更多模板浏览器访问→'),('10060','./9000','大鱼调色'),('10060','./10001','混合')] - # Compare every native Rig/widget field after reversing entity/factory IDs. - rig=scene.find('scenenode[@id="10080"]');assert factories[rig.get('factoryID')]=='402246385249454b90e08b2ee1b6bf06' - reverse=copy.deepcopy(rig) - entity_map={'10080':'3356608241','10081':'3356608243','10082':'3356608245'} - for node in reverse.iter('scenenode'): - node.set('id',entity_map[node.get('id')]);node.set('factoryID','1' if node.get('factoryID')=='6' else '6') - def structure(node):return (node.tag,dict(node.attrib),(node.text or '').strip(),[structure(child) for child in node]) - assert structure(reverse)==structure(E.parse(SOURCES/'CopyrightRig.xml').getroot()) + assert [(t.get('object'),t.get('channel'),t.get('name')) for t in pub]==[('10060','./9000','大鱼调色'),('10060','./10001','混合')] + assert all(scene.find('.//scenenode[@id="'+identity+'"]') is None for identity in ['10080','10081','10082']) + assert all(text.encode() not in data for text in ['FCP 版本作者','更多模板浏览器访问','大鱼先森Media','dayu.media']) assert not any(f.get('uuid')=='dd0036f96c9e4bfdadb82f71fbf5c9d8' for f in root.findall('factory')) - for widget_id,title,flags in [('10081','大鱼先森Media','16842768'),('10082','dayu.media','16842769')]: - widget=rig.find('scenenode[@id="'+widget_id+'"]');assert factories[widget.get('factoryID')]=='e35c74f01d5042f6b468eb530169bfb7' - menu=widget.find('parameter[@id="2"]/parameter[@id="100"]') - assert menu.attrib=={'name':'弹出式菜单','id':'100','flags':flags,'default':'2','value':'2'} - assert [entry.attrib for entry in menu.findall('entry')]==[{'name':title,'tag':'2'}] - assert widget.findtext('affecting')=='2' and widget.findtext('snapshot')=='3' assert len({n.get('id') for n in scene.iter() if n.tag in CONTENT_TAGS})==len([n for n in scene.iter() if n.tag in CONTENT_TAGS]) - return {'passed':True,'sha256':sha(data),'version':root.get('version'),'displayversion':root.findtext('displayversion'),'filterCount':1,'nativeFloatParameters':len(model['parameters']),'customParameters':3,'publications':[dict(t.attrib) for t in pub],'effectSourceType':3,'externalMediaRequired':False,'placeholder':'native Drop Zone.tiff','animationObjects':0,'copyright':{'passed':True,'rig':'10080','author':'10081','site':'10082','unbound':True},'savedSelection':{'passed':True,'selectedContentCount':0,'currentObjectIsProject':True},'hostUIVerified':False,'hostRenderVerified':False} + return {'passed':True,'sha256':sha(data),'version':root.get('version'),'displayversion':root.findtext('displayversion'),'filterCount':1,'nativeFloatParameters':len(model['parameters']),'customParameters':3,'publications':[dict(t.attrib) for t in pub],'effectSourceType':3,'externalMediaRequired':False,'placeholder':'native Drop Zone.tiff','animationObjects':0,'copyright':{'removedAtUserRequest':True,'publishedDisplayRows':0,'displayRigAbsent':True},'savedSelection':{'passed':True,'selectedContentCount':0,'currentObjectIsProject':True},'hostUIVerified':False,'hostRenderVerified':False} def main(): diff --git a/tools/deliver.py b/tools/deliver.py index 651c4bf..a232deb 100644 --- a/tools/deliver.py +++ b/tools/deliver.py @@ -53,6 +53,9 @@ def main(): for name in ['large.png','small.png']: if (ROOT/'template'/name).exists():shutil.copy2(ROOT/'template'/name,b.parent/name) identity(APP,'com.dayu.color');plugin=APP/PLUGIN;identity(plugin,'com.dayu.color.XPC') + # Xcode registers its build product with Launch Services. Keep the host from + # discovering this generated copy while signing/notarization are pending. + unregister(plugin);unregister(LOOSE) for name in ['FxPlug','PluginManager']:run('codesign','--force','--timestamp','--options','runtime','--sign',IDENTITY,str(plugin/'Contents/Frameworks'/(name+'.framework'))) run('codesign','--force','--timestamp','--options','runtime','--sign',IDENTITY,str(plugin)) run('codesign','--force','--timestamp','--options','runtime','--entitlements',str(ROOT/'大鱼调色/Wrapper Application/SandboxEntitlements.entitlements'),'--sign',IDENTITY,str(APP)) diff --git a/tools/verify_template.py b/tools/verify_template.py new file mode 100644 index 0000000..7b648b6 --- /dev/null +++ b/tools/verify_template.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python3 +"""Project-scoped 5.11 validation against recorded native FxPlug structure. + +The global skill checker currently admits 5.13+, so its original 5.11 guard +result is retained separately; this does not relabel that checker as passed. +""" +from pathlib import Path +import hashlib +import json +import runpy +import xml.etree.ElementTree as E + +ROOT=Path(__file__).resolve().parent.parent +module=runpy.run_path(str(ROOT/'tools/build_template.py'),run_name='template_contract') +file=ROOT/'template'/'\u5927\u9c7c\u8c03\u8272.moef' +data=file.read_bytes();contract=module['verify'](data,module['metadata']()) +root=E.fromstring(data);scene=root.find('scene');factories={f.get('id'):f.get('uuid') for f in root.findall('factory')} +project=[node for node in scene.findall('scenenode') if factories.get(node.get('factoryID'))==module['PROJECT_UUID']][0] +assert root.get('version')=='5.11' and root.findtext('displayversion')=='5.4.5' +mask=0x10000001;selected=[];checked=0 +for node in scene.iter(): + if node.tag in module['CONTENT_TAGS'] and node is not project: + if node.find('baseFlags') is not None: + checked+=1 + if int(node.findtext('baseFlags'))&mask:selected.append(node.get('id')) +assert not selected and scene.findtext('currentObject')==project.get('id') +assert int(project.findtext('baseFlags'))==268435473 +selection=dict(passed=True,sha256=hashlib.sha256(data).hexdigest(),version='5.11',selectionMask=hex(mask),projectID=project.get('id'),contentObjectsChecked=checked,selectedContent=[],selectedContentCount=0,currentObject=scene.findtext('currentObject'),currentObjectIsProject=True,nativeUIVerified=False,validator='project-scoped native-5.11 field comparison',scope='Saved fields only; no rendering or old-FCP execution') +qa=ROOT/'template/verification';(qa/'SavedSelection.json').write_text(json.dumps(selection,indent=2)+'\n') +skill=json.loads((qa/'SkillAudit.json').read_text()) +assert skill['errors']==['Saved selection: Unverified Motion XML version/schema; obtain native evidence first'] +assert skill['basic']['entity_ids_unique'] and skill['basic']['published_count']==2 and not skill['basic']['unresolved_media'] +evidence=dict(path='~/Movies/Motion Templates.localized/Effects.localized/Color Finale/ColorFinalePro/ColorFinalePro.moef',sha256='bfab9157b988acaf5c078a0837085843f2021e93a2e411eec9d94120f11ddd69',version='5.11',displayversion='5.4.5',projectBaseFlags=268435473,currentObject='10000',scenenodeVersion='5',widgetBaseFlags=16,layerAndSourceBaseFlags=524304,fxPlugBaseFlags=8589934608,allContentSelectionBits=0) +report=dict(passed=True,sha256=selection['sha256'],version='5.11',displayversion='5.4.5',nativeReference=evidence,staticContract=contract,savedSelection=selection,skillCheckerStatus='unsupported-version-guard; original SkillAudit.json retained unchanged',otherSkillStructuralErrors=[],copyrightDisplayRows=0,oldFCPActuallyTested=False,scope='Native-template structure and saved-state comparison only; FCP host acceptance is separate') +(qa/'Compatibility.json').write_text(json.dumps(report,ensure_ascii=False,indent=2)+'\n') +print(json.dumps(dict(passed=True,version=report['version'],displayversion=report['displayversion'],copyrightDisplayRows=0,contentSelected=0,oldFCPActuallyTested=False))) diff --git a/verification/PrintLooksBuild35Superseded.json b/verification/PrintLooksBuild35Superseded.json new file mode 100644 index 0000000..a2d4728 --- /dev/null +++ b/verification/PrintLooksBuild35Superseded.json @@ -0,0 +1,20 @@ +{ + "version": "1.6.0", + "build": "35", + "compiledSource": "2b2d657de754dd5b362cc0be07cb10d5e671a745", + "notarization": { + "id": "3819fbc3-6b7d-4b89-b09a-3e5d9c0f0851", + "status": "Accepted", + "message": "Processing complete" + }, + "stapled": true, + "installed": false, + "reason": "Host reopened before replacement. Delivery safety gate retained installed 1.5.0. User then requested template copyright removal and lower version, superseding this candidate.", + "supersededByBuild": "36", + "submittedZipSHA256": "ba3ee8a2a0e5dfbaabaeabaed0aa9ebc3bd4eccd854a6c6b62c38ac762afc44e", + "generatedCopiesRemoved": [ + "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/DerivedData/Build/Products/Release/大鱼调色.app", + "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/DerivedData/Build/Products/Release/大鱼调色 XPC Service.pluginkit", + "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/notarization-submission.zip" + ] +} diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 7fa83a3..9ffc73f 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.6.0 CFBundleVersion - 35 + 36 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 8f780fb..9a9ada0 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.6.0 CFBundleVersion - 35 + 36 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright