diff --git a/Packaging/Release-1.22.0.md b/Packaging/Release-1.22.0.md new file mode 100644 index 0000000..e5ef00f --- /dev/null +++ b/Packaging/Release-1.22.0.md @@ -0,0 +1,10 @@ +大鱼调色 1.22.0(128)增加在线 LUT 库。 + +- 主 APP 增加微信登录、刷新权限和退出登录。购买过文章 14421、15792 中任意一个,或当前为有效会员,即可使用全部已发布在线 LUT。 +- 插件 LUT 浏览器增加在线来源、分类、分页和搜索。点击 LUT 后下载并检查文件大小、SHA-256 和 Cube 内容,保存到本地库后应用;相同文件重复下载复用已有副本。 +- 点击“预览当前帧”会将当前时间线帧的 PNG 缩略图发送到 dayu.media,在服务器应用相应 LUT 并返回效果预览。最长边不超过 640 像素;不上传原始视频、文件路径或项目名称。服务器在请求内存中处理,不保存预览帧。移动播放头不会自动上传新帧,需要再次点击更新。 +- 在线预览为 8-bit 显示参考;实际调色仍使用下载后的本地 LUT 和原有浮点渲染流程。本地 LUT 导入与调色继续可离线使用。 + +适用于 Apple Silicon,macOS 14.6 或更高版本,Final Cut Pro / Motion。安装前请保存工作并正常退出 FCP、Motion 和大鱼调色主 APP。安装后在主 APP 完成微信登录,再在插件 LUT 浏览器切换“在线 LUT”。 + +正式签名、公证、安装、宿主验收与安装包校验结果见本版本交付记录。 diff --git a/research/OnlineLUTIntegration-20261111.md b/research/OnlineLUTIntegration-20261111.md index dfceffa..b6054ca 100644 --- a/research/OnlineLUTIntegration-20261111.md +++ b/research/OnlineLUTIntegration-20261111.md @@ -23,3 +23,5 @@ 已完成专用会话与权限接口、在线目录及内存 PNG 渲染器;主 APP 微信登录/权限卡片、共享钥匙串客户端、浏览器在线分类/分页/帧预览/下载应用及去重导入已接入。首次 Release 配置编译通过,PHP 合约检查通过。尚未部署后端、尚未运行正式新版、尚未公证或发布;下一步补充原生浏览器与导入检查,检查线上接口后进行正式交付。 第二阶段:PHP/GD 权限与渲染合约 36 项、原生 AppKit 在线浏览器与导入合约 36 项通过;原生测试模拟网络应答,未使用用户凭据或上传真实时间线帧。已从现有公开接口盘点 1,233 个发布 LUT 和 17 个分类。准备 1.22.0(127)正式交付,后台部署前检查点包含专用部署脚本及安装说明。 + +部署与修正:两个新增生产文件已按映射部署并核对内容;线上 6 项未登录/伪造凭据检查通过,本地浏览器 40 项回归通过。127 候选 APP 已获 Apple Accepted 并完成票据验证,安装后的 CLI 检查期间停止交付,未进行用户界面验收或发布。保留 126 恢复 APP;127 的来源、公证和备份见 `verification/SupersededOnlineLUTBuild127.json`。补齐清除/本地选择时的在线选中状态复位,最终候选改为 1.22.0(128)。交付脚本安装后校验区在键盘中断时也执行回滚。 diff --git a/tools/deliver.py b/tools/deliver.py index 35c6ddc..83bbb79 100644 --- a/tools/deliver.py +++ b/tools/deliver.py @@ -137,7 +137,7 @@ def main(): time.sleep(.25) else:raise RuntimeError('未从正式安装路径启动') template_hashes=install_templates() - except Exception: + except BaseException: failed=DEST.parent/('.dayu-color-failed-'+uuid.uuid4().hex+'.app');os.replace(DEST,failed) if old:os.replace(old,DEST);old=None raise diff --git a/tools/verify_online_luts.mm b/tools/verify_online_luts.mm index 3de3c86..732be19 100644 --- a/tools/verify_online_luts.mm +++ b/tools/verify_online_luts.mm @@ -14,6 +14,7 @@ - (void)searchChanged:(id)sender; - (void)captureOnlineFrame; - (void)thumbnailClicked:(id)sender; +- (void)clearSelection:(id)sender; - (void)rebuildGrid; - (void)layoutBrowser; @end @@ -83,6 +84,8 @@ int main(int argc,const char **argv){@autoreleasepool{ NSUInteger previous=count(@"/preview");[browser updatePreview:@{@"standard":pixels,@"standardSize":[NSValue valueWithSize:NSMakeSize(320,180)],@"time":@2}];require(count(@"/preview")==previous,@"new timeline frames never trigger automatic uploads"); NSDictionary *tiles=[browser valueForKey:@"tiles"];NSButton *tile=tiles.allValues.firstObject;[browser thumbnailClicked:tile];pump(^{return [browser valueForKey:@"selectionTask"]==nil&&applied!=nil;}); require([applied hasPrefix:library.rootURL.path]&&[NSFileManager.defaultManager fileExistsAtPath:applied],@"downloaded verified LUT is applied through local host selection"); + [browser clearSelection:nil];pump(^{return [browser valueForKey:@"selectionTask"]==nil;});require([browser valueForKey:@"onlineSelectedPath"]==nil&&[browser valueForKey:@"selectedPath"]==nil,@"clearing online LUT removes both local and online selection markers"); + [browser thumbnailClicked:tile];pump(^{return [browser valueForKey:@"selectionTask"]==nil;}); NSUInteger localCount=library.entries.count;[browser thumbnailClicked:tile];pump(^{return [browser valueForKey:@"selectionTask"]==nil;});require(library.entries.count==localCount,@"repeated online click does not duplicate installed LUT"); badDownload=YES;[browser thumbnailClicked:tile];pump(^{return [browser valueForKey:@"selectionTask"]==nil;});require([[[browser valueForKey:@"statusLabel"]stringValue]containsString:@"大小"],@"incomplete download produces a visible error");badDownload=NO; paid=NO;[browser folderClicked:folder];pump(^{return [browser valueForKey:@"onlineCatalogTask"]==nil;});require([[browser valueForKey:@"onlineEntries"]count]==0,@"permission rejection removes online entries"); diff --git a/verification/LocalLUTBrowserRegression1.22.0.json b/verification/LocalLUTBrowserRegression1.22.0.json new file mode 100644 index 0000000..b910125 --- /dev/null +++ b/verification/LocalLUTBrowserRegression1.22.0.json @@ -0,0 +1,166 @@ +{ + "pass" : true, + "checks" : [ + { + "name" : "report destination supplied", + "pass" : true + }, + { + "name" : "isolated library loaded", + "pass" : true + }, + { + "name" : "recent use deduplicates and puts latest first", + "pass" : true + }, + { + "name" : "recent history survives a new library instance", + "pass" : true + }, + { + "name" : "asynchronous browser task completed", + "pass" : true + }, + { + "name" : "recent category is first in the sidebar", + "pass" : true + }, + { + "name" : "recent category contains only used LUTs in order", + "pass" : true + }, + { + "name" : "all LUTs also put recent uses before unused names", + "pass" : true + }, + { + "name" : "loading does not update recent history", + "pass" : true + }, + { + "name" : "host rejection does not update history", + "pass" : true + }, + { + "name" : "only successful host application records recent use", + "pass" : true + }, + { + "name" : "selecting a LUT keeps the tiles in place and updates selection", + "pass" : true + }, + { + "name" : "search respects recent-first ordering", + "pass" : true + }, + { + "name" : "clearing a search still uses the opening order", + "pass" : true + }, + { + "name" : "recent folder also uses the opening order", + "pass" : true + }, + { + "name" : "grid reflows when the browser size changes", + "pass" : true + }, + { + "name" : "list layout has full-width rows", + "pass" : true + }, + { + "name" : "sidebar divider changes folder width without overlapping previews", + "pass" : true + }, + { + "name" : "asynchronous browser task completed", + "pass" : true + }, + { + "name" : "layout and sidebar width survive reopening", + "pass" : true + }, + { + "name" : "reopening places the successful selection first", + "pass" : true + }, + { + "name" : "asynchronous browser task completed", + "pass" : true + }, + { + "name" : "remote-parent checks never display a test window", + "pass" : true + }, + { + "name" : "asynchronous browser task completed", + "pass" : true + }, + { + "name" : "list thumbnail keeps portrait aspect", + "pass" : true + }, + { + "name" : "portrait grid cards follow frame geometry", + "pass" : true + }, + { + "name" : "asynchronous browser task completed", + "pass" : true + }, + { + "name" : "asynchronous browser task completed", + "pass" : true + }, + { + "name" : "click reuses the original and selected tile bitmaps without replacing preview work", + "pass" : true + }, + { + "name" : "empty snapshots keep both previews and pending work", + "pass" : true + }, + { + "name" : "same-time host render after selection cannot replace the comparison reference", + "pass" : true + }, + { + "name" : "previous previews stay visible while the next frame renders", + "pass" : true + }, + { + "name" : "asynchronous browser task completed", + "pass" : true + }, + { + "name" : "moving the playhead replaces the original and both uses of the LUT bitmap", + "pass" : true + }, + { + "name" : "asynchronous browser task completed", + "pass" : true + }, + { + "name" : "the comparison and grid use the same high resolution frame", + "pass" : true + }, + { + "name" : "remote window geometry is owned and remembered by the host", + "pass" : true + }, + { + "name" : "remote close callback runs once", + "pass" : true + }, + { + "name" : "recent history stays bounded at 40 newest paths", + "pass" : true + }, + { + "name" : "isolated fixtures and preferences cleaned", + "pass" : true + } + ], + "scope" : "Real AppKit browser objects, hidden host-owned window fixture, asynchronous acknowledgement and root-scoped history; no visible test app or user LUT changes." +} \ No newline at end of file diff --git a/verification/OnlineLUTBuildRecovery.json b/verification/OnlineLUTBuildRecovery.json new file mode 100644 index 0000000..cb2d016 --- /dev/null +++ b/verification/OnlineLUTBuildRecovery.json @@ -0,0 +1,6 @@ +{ + "sourceCommit": "a04c4a69ed64a7954d47d363e1776ca4082382c4", + "independentHTTPSClone": true, + "verifiedBuildInputFiles": 259, + "scope": "App, template and colour-management tracked inputs; project file built from committed version, with only pre-existing reference ordering difference left in original workspace." +} diff --git a/verification/OnlineLUTDeployment.json b/verification/OnlineLUTDeployment.json new file mode 100644 index 0000000..11ba0af --- /dev/null +++ b/verification/OnlineLUTDeployment.json @@ -0,0 +1,27 @@ +{ + "timestamp": "202611111831", + "mount": "//dayu@192.168.31.21/dayumedia%20%28%E5%AD%98%E5%82%A8%E7%A9%BA%E9%97%B41%29 on /Volumes/dayumedia (存储空间1) (smbfs, nodev, nosuid, mounted by mac)", + "localProject": "/Users/mac/Downloads/dayumedia/dayu-color-beta", + "nasRoot": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media", + "sourceCommit": "a04c4a69ed64a7954d47d363e1776ca4082382c4", + "files": [ + { + "path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/mu-plugins/dayu-color-online-luts/renderer.php", + "sha256": "ad34c71fd35f20a6813099bceed662ddae5ed3c96c3bc3855a21853e4eadafce", + "backup": null, + "size": 5286, + "relativePath": "wp-content/mu-plugins/dayu-color-online-luts/renderer.php", + "readable": true, + "mode": "0o700" + }, + { + "path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/mu-plugins/dayu-color-online-luts.php", + "sha256": "ac103370def8bb0d3ab402737bb8290ef540b33ec4c20365edd85e07ca366f31", + "backup": null, + "size": 11992, + "relativePath": "wp-content/mu-plugins/dayu-color-online-luts.php", + "readable": true, + "mode": "0o700" + } + ] +} diff --git a/verification/OnlineLUTLiveAccess.json b/verification/OnlineLUTLiveAccess.json new file mode 100644 index 0000000..30adb33 --- /dev/null +++ b/verification/OnlineLUTLiveAccess.json @@ -0,0 +1,49 @@ +{ + "checkedAt": "2026-11-11T18:31:50.623564+08:00", + "pass": true, + "checks": [ + { + "route": "status", + "forgedToken": false, + "status": 401, + "code": "dayu_color_lut_login_required", + "pass": true + }, + { + "route": "catalog", + "forgedToken": false, + "status": 401, + "code": "dayu_color_lut_login_required", + "pass": true + }, + { + "route": "1/download", + "forgedToken": false, + "status": 401, + "code": "dayu_color_lut_login_required", + "pass": true + }, + { + "route": "1/preview", + "forgedToken": false, + "status": 401, + "code": "dayu_color_lut_login_required", + "pass": true + }, + { + "route": "status", + "forgedToken": true, + "status": 401, + "code": "dayu_color_lut_login_required", + "pass": true + }, + { + "route": "session", + "forgedToken": false, + "status": 401, + "code": "dayu_color_lut_expired", + "pass": true + } + ], + "scope": "Anonymous, invalid login and forged credential rejection only; authorized live catalogue, downloads and uploaded frames require a user-approved login." +} diff --git a/verification/OnlineLUTNativeContracts.json b/verification/OnlineLUTNativeContracts.json index 222ad4b..a918efb 100644 --- a/verification/OnlineLUTNativeContracts.json +++ b/verification/OnlineLUTNativeContracts.json @@ -1,6 +1,6 @@ { "scope" : "Isolated AppKit browser with simulated network replies; real Cube validation\/import; no user credentials, no production frame upload, no visible test app.", - "count" : 36, + "count" : 39, "pass" : true, "checks" : [ { @@ -123,6 +123,18 @@ "name" : "asynchronous operation finished", "pass" : true }, + { + "name" : "clearing online LUT removes both local and online selection markers", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, { "name" : "repeated online click does not duplicate installed LUT", "pass" : true diff --git a/verification/SupersededOnlineLUTBuild127.json b/verification/SupersededOnlineLUTBuild127.json new file mode 100644 index 0000000..f4cd675 --- /dev/null +++ b/verification/SupersededOnlineLUTBuild127.json @@ -0,0 +1,19 @@ +{ + "version": "1.22.0", + "build": "127", + "sourceCommit": "a04c4a69ed64a7954d47d363e1776ca4082382c4", + "state": "superseded-before-user-interface-acceptance", + "reason": "Online clear/local selection marker fix will ship in build 128; delivery interrupted during installed CLI checks.", + "notarization": { + "message": "Processing complete", + "status": "Accepted", + "id": "f9021989-1515-46bf-8b0e-beb3b6d6bab5" + }, + "previousBackups": [ + { + "path": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-fab5a28e546845ccaa2d04848773912e.app", + "version": "1.21.8", + "build": "126" + } + ] +} diff --git a/大鱼调色/Plugin/DYLUTBrowser.mm b/大鱼调色/Plugin/DYLUTBrowser.mm index cfc8c35..6cd8aab 100644 --- a/大鱼调色/Plugin/DYLUTBrowser.mm +++ b/大鱼调色/Plugin/DYLUTBrowser.mm @@ -789,6 +789,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b void (^applied)(NSError *)=^(NSError *error){ if(_closed||generation!=_selectionGeneration)return;[_selectionTask release];_selectionTask=nil; if(error){[self setStatus:error.localizedDescription];return;} + [_onlineSelectedPath release];_onlineSelectedPath=nil; [_selectedPath release];_selectedPath=[path copy];[_library recordUsedPath:path]; [_selectionFrameTime release];_selectionFrameTime=[_previewFrames[@"time"] retain];[self refreshComparison]; for(DYBrowserTile *tile in _tiles.allValues){tile.chosen=[tile.identifier isEqualToString:path];[tile setNeedsDisplay:YES];} @@ -802,6 +803,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b void (^cleared)(NSError *)=^(NSError *error){ if(_closed||generation!=_selectionGeneration)return;[_selectionTask release];_selectionTask=nil; if(error){[self setStatus:error.localizedDescription];return;} + [_onlineSelectedPath release];_onlineSelectedPath=nil; [_selectedPath release];_selectedPath=nil; [_selectionFrameTime release];_selectionFrameTime=[_previewFrames[@"time"] retain];[self refreshComparison]; for(DYBrowserTile *tile in _tiles.allValues){tile.chosen=NO;[tile setNeedsDisplay:YES];} diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index b45df74..ef40be8 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.22.0 CFBundleVersion - 127 + 128 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 718443d..e696996 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.22.0 CFBundleVersion - 127 + 128 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/开发交接.md b/开发交接.md index 2b226ad..18799b8 100644 --- a/开发交接.md +++ b/开发交接.md @@ -4,7 +4,7 @@ ## 2026-11-11 在线 LUT 下载可行性 -后续用户已要求实际接入在线分类、主 APP 登录、14421/15792 任一购买或会员权限,以及时间线帧在线效果预览。实现与生产路径见[专项记录](research/OnlineLUTIntegration-20261111.md),接入前基线为 `5fae1150f4b7b6087f5da8298b5ac3ad8916e529`。首个实现检查点已包含后端、主 APP 登录和浏览器接入;Release 编译、PHP/GD 权限渲染合约与 36 项原生在线浏览器检查通过。准备 1.22.0(127),部署及正式交付仍待执行。以下保留此前可行性结论。 +后续用户已要求实际接入在线分类、主 APP 登录、14421/15792 任一购买或会员权限,以及时间线帧在线效果预览。实现与生产路径见[专项记录](research/OnlineLUTIntegration-20261111.md),接入前基线为 `5fae1150f4b7b6087f5da8298b5ac3ad8916e529`。首个实现检查点已包含后端、主 APP 登录和浏览器接入;Release 编译、PHP/GD 权限渲染合约与 36 项原生在线浏览器检查通过。两个后端文件已部署,线上 6 项未授权检查及 40 项本地浏览器回归通过。最终候选为 1.22.0(128);127 公证安装后尚未完成 CLI 检查,已停止发行,126 恢复副本保留,详见专项记录。以下保留此前可行性结论。 用户询问 LUT 浏览器能否联网下载预置 LUT,随后明确关心 FxPlug4 插件独立界面本身是否能够联网。核对当前源码、正式安装元数据及 Apple 官方文档;正式版本仍为 **1.21.8(126)**。首轮接手提交 `f554b11e6c17aaf38a7ae136787cdbb3eb9d45da` 与远端 `main` 一致,可行性记录已保存为 `995ac745d05fa0f5f1bbd142ae4ef6af45e281df`。两轮均未修改功能、运行宿主或发布新版本。