From da700d4e2fc1930d34702872029f9c64fe28ab90 Mon Sep 17 00:00:00 2001 From: mac Date: Wed, 11 Nov 2026 20:57:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80LUT=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E6=A0=91=E5=B9=B6=E5=9C=A8=E5=BC=80=E7=AA=97=E6=97=B6=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=89=B9=E9=87=8F=E9=A2=84=E8=BD=BD=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=B8=A7=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Packaging/build_pkg.py | 2 +- research/OnlineLUTRelease131Handoff.md | 16 ++ tools/verify_browser_customization.mm | 4 + tools/verify_online_luts.mm | 43 +++- verification/UnifiedLUTBrowser1.22.1.json | 243 +++++++++++++++++++++ 大鱼调色/Plugin/DYLUTBrowser.mm | 179 +++++++++------ 大鱼调色/Plugin/Info.plist | 4 +- 大鱼调色/Wrapper Application/AppDelegate.m | 4 +- 大鱼调色/Wrapper Application/Info.plist | 4 +- 开发交接.md | 16 +- 10 files changed, 427 insertions(+), 88 deletions(-) create mode 100644 research/OnlineLUTRelease131Handoff.md create mode 100644 verification/UnifiedLUTBrowser1.22.1.json diff --git a/Packaging/build_pkg.py b/Packaging/build_pkg.py index 446a27a..12f5a74 100644 --- a/Packaging/build_pkg.py +++ b/Packaging/build_pkg.py @@ -144,7 +144,7 @@ def main(): appearance=dict(title="大鱼调色", subtitle="适用于 Final Cut Pro 与 Motion 的原生调色效果", badgeImage=str(ROOT / "design/dayu-color-app-icon-v1.png"), authorContact="https://dayu.media"), pages=dict(welcome="安装大鱼调色 " + version + ",包含原生 FxPlug 调色插件和 Final Cut Pro 效果入口。", - readme="系统要求:macOS 14.6 或更高版本。本发行构建适用于 Apple Silicon Mac。\n\n安装内容:\n/Library/Plug-Ins/FxPlug/大鱼调色.app\n登录用户“影片/Motion Templates/Effects/大鱼调色”中的效果模板与预览图。\n\n重新打开 Final Cut Pro 后,在“效果 → 大鱼调色”中应用;Motion 中可选择原生滤镜。\n本安装包不包含用户自选 LUT、预设或媒体文件。\n\n公测诊断默认开启,可在主 APP 关闭。仅发送版本、系统环境、阶段耗时、资源使用与本产品崩溃/卡顿调用栈摘要到 dayu.media;不发送素材、预设或账号,保留30天。在线 LUT 在主 APP 启动时自动识别本机已绑定的大鱼账号;未绑定时可微信登录。有效会员或购买文章 14421 / 15792 可使用全部已发布在线 LUT。插件内点击“预览当前帧”时,单独发送当前帧缩略图到 dayu.media 用于在线效果预览;服务器内存处理,不保存预览帧,不上传视频文件。主 APP 启动时检查更新,新版由用户确认安装。", + readme="系统要求:macOS 14.6 或更高版本。本发行构建适用于 Apple Silicon Mac。\n\n安装内容:\n/Library/Plug-Ins/FxPlug/大鱼调色.app\n登录用户“影片/Motion Templates/Effects/大鱼调色”中的效果模板与预览图。\n\n重新打开 Final Cut Pro 后,在“效果 → 大鱼调色”中应用;Motion 中可选择原生滤镜。\n本安装包不包含用户自选 LUT、预设或媒体文件。\n\n公测诊断默认开启,可在主 APP 关闭。仅发送版本、系统环境、阶段耗时、资源使用与本产品崩溃/卡顿调用栈摘要到 dayu.media;不发送素材、预设或账号,保留30天。在线 LUT 在主 APP 启动时自动识别本机已绑定的大鱼账号;未绑定时可微信登录。有效会员或购买文章 14421 / 15792 可使用全部已发布在线 LUT。打开插件 LUT 浏览器时,自动发送当前缓存帧缩略图到 dayu.media 并批量生成在线预览;服务器内存处理,不保存预览帧,不上传视频文件。在线与本地分类统一显示,点击在线 LUT 后安装到本地对应分类并应用,可供离线使用。主 APP 启动时检查更新,新版由用户确认安装。", license="", conclusion="大鱼调色已安装。主 APP 自动注册插件,成功后保持运行。关闭窗口仍在后台收集已开启的诊断;菜单栏可重新打开或退出。请重开宿主并实际检查效果。")) manifest_path = CACHE / "dayu-color-package-manifest.json" manifest_path.write_text(json.dumps(manifest, ensure_ascii=False, indent=2) + "\n") diff --git a/research/OnlineLUTRelease131Handoff.md b/research/OnlineLUTRelease131Handoff.md new file mode 100644 index 0000000..5d581b6 --- /dev/null +++ b/research/OnlineLUTRelease131Handoff.md @@ -0,0 +1,16 @@ +# 1.22.0(131)交接快照 + +## 1.22.0(131)在线 LUT + +已接入主 APP 硬件 UUID 账号识别、微信登录回退、在线分类/搜索/分页、校验下载及手动当前帧在线预览。有效会员,或购买文章 **14421 / 15792 任意一个**的账号,可浏览全部已发布在线 LUT;每次请求由服务端复核设备绑定与权益。本地调色保持离线可用。点击“预览当前帧”才上传最长边 640 的 PNG 缩略图到 dayu.media,服务器内存处理,不保存帧;移动播放头不会自动上传。 + +两个 MU 后端文件已按 NAS 生产基线流程部署。44 项后端合约、46 项原生在线浏览器合约、40 项本地浏览器回归、6 项线上未授权检查和既有更新接口检查通过。最终正式 APP 的签名、票据、Gatekeeper、1,028 项正式安装检查、17 套模板及 PluginKit 唯一路径通过。 + +已从唯一正式路径启动 **1.22.0(131)**,APP 公证 `1e57ee70-d099-4942-91fd-29a2d5f47a44` Accepted;实际编译为独立远端检出的 `d979f8958caf36cc7b97ea838960c69f7fbb4d91`。主 APP 自动识别 macOS 硬件 UUID 绑定账号,退出保持退出,刷新恢复通过。FCP 12.4 独立合成色卡验证共享登录、1,233 个 LUT/17 分类、云端当前帧缩略图、下载应用、原图划像和 2:01→3:24 播放,宿主正常退出。主 APP 留在已登录可用状态。只上传合成色卡,未上传用户素材。真实接口另核对全部 21 页、搜索、分类与下载摘要。 + +现场发现 SQL 编号/大小以字符串输出导致空网格,已在后端修正,44 项 PHP 合约覆盖,并在正式 FCP 重新验收通过。新机未绑定时的微信 OAuth 首次扫码和 Motion 宿主未实测。130 的 APP/PKG 曾通过验证但未发行,现已被 131 取代。最终 PKG 已完成 Installer 签名、公证 `bfb54c49-b563-4420-9e9b-2319e1565420`、票据与 Gatekeeper 验证,20 项验包通过;大小 44557321 字节,SHA-256 `82bfe89889bd7e09ba68d85c0a52f36bb291de4cfe98c509fb6df8d40d9dd2dd`。Release **428** 已发布,附件 **69** 完整下载通过;标签 `v1.22.0-online-luts-20261111` 指向 `31d1089264e10469bececa7b27b3bcd06a7eb445`。独立远端恢复逐字节核对 911 个跟踪文件和 Git 完整性,APP 构建输入与实际编译提交一致。 + +[专项实现和生产映射](research/OnlineLUTIntegration-20261111.md) · [部署](verification/OnlineLUTDeployment.json) · [安装](verification/Delivery1.22.0.json) · [宿主范围](verification/HostOnlineLUT1.22.0.json) · [构建恢复](verification/OnlineLUTBuildRecovery.json)。127/128/129/130 为未发行候选,其诊断证据保留;最终 131 验证后已清理已知替换备份。工程文件既有的 Security 引用排序差异保留,不纳入本任务提交。站点文章和更新通道暂仍为 1.21.8(126),本轮没有改动它们。 + +[Release 及下载](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.0-online-luts-20261111) · [发行校验](verification/Release1.22.0.json) · [验包](verification/Package1.22.0.json) · [独立恢复](verification/Recovery1.22.0.json)。本轮合成验收库、恢复检出、参考检出、下载副本和旧版生成备份已清理;正式浏览器下载的一个有效 LUT 保留供离线使用。 + diff --git a/tools/verify_browser_customization.mm b/tools/verify_browser_customization.mm index b1b0647..51fb479 100644 --- a/tools/verify_browser_customization.mm +++ b/tools/verify_browser_customization.mm @@ -1,6 +1,8 @@ #import #import "../大鱼调色/Plugin/DYLUTBrowser.h" #import "../大鱼调色/Plugin/DYLUTLibrary.h" +#import "../大鱼调色/Shared/DYOnlineLUT.h" +#import @interface DYLUTBrowser (Probe) - (void)layoutBrowser; - (void)layoutChanged:(id)sender; @@ -10,9 +12,11 @@ - (void)qualityChanged:(id)sender; @end static NSMutableArray *checks; +static NSProgress *offlineFixture(id cls,SEL sel,NSString *path,NSDictionary *body,BOOL authenticated,DYOnlineLUTReply reply){NSProgress *task=[NSProgress discreteProgressWithTotalUnitCount:1];dispatch_async(dispatch_get_main_queue(),^{reply(nil,[NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorNotConnectedToInternet userInfo:nil]);});return task;} static void require(BOOL pass,NSString *name){[checks addObject:@{@"name":name,@"pass":@(pass)}];if(!pass){fprintf(stderr,"FAIL %s\n",name.UTF8String);exit(1);}} static void pump(BOOL(^done)(void)){double end=NSProcessInfo.processInfo.systemUptime+15;while(!done()&&NSProcessInfo.processInfo.systemUptime @interface DYLUTBrowser (OnlineAcceptance) -- (void)sourceChanged:(id)sender; +- (void)startOnlinePreviews; - (void)revealLibrary:(id)sender; - (void)previousOnlinePage:(id)sender; - (void)folderClicked:(id)sender; @@ -69,15 +69,21 @@ int main(int argc,const char **argv){@autoreleasepool{ NSImage *image=DYLUTThumbnail(nil,pixels,320,180,NSMakeSize(320,180),nil);renderPNG=[[(NSBitmapImageRep *)image.representations[0]representationUsingType:NSBitmapImageFileTypePNG properties:@{}]retain]; __block NSString *applied=nil; DYLUTBrowser *browser=[[DYLUTBrowser alloc]initWithLibrary:library preview:frame selectedPath:nil palette:@{} selection:^NSProgress *(NSString *path,void(^completion)(NSError *)){NSProgress *job=[NSProgress discreteProgressWithTotalUnitCount:1];dispatch_async(dispatch_get_main_queue(),^{[applied release];applied=[path copy];completion(nil);});return job;}]; - pump(^{return [browser valueForKey:@"libraryTask"]==nil;});require(!browser.window.visible,@"acceptance never displays an unsigned test app");[browser setValue:@YES forKey:@"visible"];[browser setValue:@YES forKey:@"remoteMode"]; - NSPopUpButton *source=[browser valueForKey:@"sourceMenu"];[source selectItemAtIndex:1];[browser sourceChanged:source];pump(^{return [[browser valueForKey:@"onlineEntries"]count]==10;}); - require(count(@"/catalog")==1&&count(@"/preview")==0,@"opening online categories does not upload a timeline frame"); - require([[[browser valueForKey:@"importFiles"]accessibilityLabel]isEqual:@"在线预览当前帧"],@"online preview accessibility label reflects its actual action"); - require([[browser valueForKey:@"folderPaths"]count]==4,@"online categories include all and named categories"); + pump(^{return [browser valueForKey:@"libraryTask"]==nil;});require(!browser.window.visible,@"acceptance never displays an unsigned test app"); + require(count(@"/catalog")==0&&count(@"/preview")==0,@"constructing an unopened browser never uploads a frame"); + NSView *parent=[[[NSView alloc]initWithFrame:NSMakeRect(0,0,1200,760)]autorelease];[browser showInRemoteParent:parent close:nil]; + pump(^{return count(@"/preview")==10&&[[browser valueForKey:@"onlineTransfers"]count]==0;}); + require(![[browser valueForKey:@"onlineMode"]boolValue],@"opening local library also preloads the online page"); + require(count(@"/catalog")==1&&count(@"/preview")==10,@"opening browser automatically uploads cached frame and previews the whole online page"); + NSArray *folders=[browser valueForKey:@"folderPaths"];require([folders containsObject:@"@online"]&&[folders containsObject:@"@online/婚礼"]&&[folders containsObject:@"在线 LUT"],@"local and online categories share one sidebar with separate stable identities"); + NSButton *online=[NSButton buttonWithTitle:@"在线 LUT" target:nil action:nil];online.identifier=@"@online";[browser folderClicked:online]; + pump(^{return [browser valueForKey:@"onlineCatalogTask"]==nil;}); + require([[[browser valueForKey:@"importFiles"]accessibilityLabel]isEqual:@"更新在线预览缓存帧"],@"optional refresh action has an accurate accessibility label"); + require(count(@"/preview")==10,@"switching to online root reuses the automatically generated previews"); require([[[browser valueForKey:@"countLabel"]stringValue]containsString:@"1233"],@"online total and pagination remain visible"); - [browser revealLibrary:nil];pump(^{return [[browser valueForKey:@"onlineCatalogTask"]isFinished]||[browser valueForKey:@"onlineCatalogTask"]==nil;});require([[requests.lastObject objectForKey:@"body"][@"page"]integerValue]==2,@"next page requests page two"); + [browser revealLibrary:nil];pump(^{return [[browser valueForKey:@"onlineCatalogTask"]isFinished]||[browser valueForKey:@"onlineCatalogTask"]==nil;});NSDictionary *lastCatalog=nil;for(NSDictionary *r in requests)if([r[@"path"]hasSuffix:@"/catalog"])lastCatalog=r;require([lastCatalog[@"body"][@"page"]integerValue]==2,@"next page requests page two"); [browser previousOnlinePage:nil];pump(^{return [browser valueForKey:@"onlineCatalogTask"]==nil;}); - NSButton *folder=[NSButton buttonWithTitle:@"婚礼" target:nil action:nil];folder.identifier=@"婚礼";[browser folderClicked:folder];pump(^{return [browser valueForKey:@"onlineCatalogTask"]==nil;});require([requests.lastObject[@"body"][@"category"]isEqual:@"婚礼"],@"category filter is sent to the server"); + NSButton *folder=[NSButton buttonWithTitle:@"婚礼" target:nil action:nil];folder.identifier=@"@online/婚礼";[browser folderClicked:folder];pump(^{return [browser valueForKey:@"onlineCatalogTask"]==nil;});NSDictionary *categoryRequest=nil;for(NSDictionary *r in requests)if([r[@"path"]hasSuffix:@"/catalog"])categoryRequest=r;require([categoryRequest[@"body"][@"category"]isEqual:@"婚礼"],@"online child category is sent to server without sidebar prefix"); NSUInteger before=count(@"/preview");[browser captureOnlineFrame];pump(^{return count(@"/preview")>before&&[[browser valueForKey:@"onlineTransfers"]count]==0;}); require(maxPreviews<=2,@"browser limits simultaneous remote preview work"); NSDictionary *upload=nil;for(NSDictionary *r in requests)if([r[@"path"]hasSuffix:@"/preview"]){upload=r;break;} @@ -86,6 +92,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"); + require([applied containsString:@"/在线 LUT/婚礼/"],@"clicked online LUT installs into its local category"); + require([[browser valueForKey:@"folderPaths"]containsObject:@"在线 LUT/婚礼"],@"download immediately adds the second-level local category to the same sidebar"); NSDictionary *reference=[browser valueForKey:@"previewFrames"];NSMutableData *alreadyGraded=[pixels mutableCopy];((float *)alreadyGraded.mutableBytes)[0]=.9; [browser updatePreview:@{@"standard":alreadyGraded,@"standardSize":[NSValue valueWithSize:NSMakeSize(320,180)],@"time":@2}]; require([[browser valueForKey:@"previewFrames"]isEqual:reference],@"same-time host redraw cannot regrade the online upload reference");[alreadyGraded release]; @@ -95,10 +103,25 @@ int main(int argc,const char **argv){@autoreleasepool{ 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"); - [source selectItemAtIndex:0];[browser sourceChanged:source];require(![[browser valueForKey:@"onlineMode"]boolValue]&&[[browser valueForKey:@"visibleEntries"]count]>0,@"local LUT library remains usable without online permission"); + NSButton *local=[NSButton buttonWithTitle:@"全部本地 LUT" target:nil action:nil];local.identifier=@"*";[browser folderClicked:local];require(![[browser valueForKey:@"onlineMode"]boolValue]&&[[browser valueForKey:@"visibleEntries"]count]>0,@"local LUT library remains usable without online permission"); require([[browser valueForKey:@"reveal"]isEnabled],@"local reveal button is restored after an online empty page or error"); NSButton *localTile=[[[browser valueForKey:@"tiles"]allValues]firstObject];[localTile setEnabled:YES];[browser thumbnailClicked:localTile];pump(^{return [browser valueForKey:@"selectionTask"]==nil;});require([browser valueForKey:@"onlineSelectedPath"]==nil,@"local selection resets previous online highlight"); - [browser close];[browser release];[library release];[applied release];[installed release]; + // Hierarchy uses exact folder membership; a sibling with a common prefix is excluded. + NSString *nested=[library.rootURL.path stringByAppendingPathComponent:@"胶片/人像/柔和"];[NSFileManager.defaultManager createDirectoryAtPath:nested withIntermediateDirectories:YES attributes:nil error:nil]; + [cubeData writeToFile:[nested stringByAppendingPathComponent:@"Nested.cube"]atomically:YES]; + NSString *sibling=[library.rootURL.path stringByAppendingPathComponent:@"胶片2"];[NSFileManager.defaultManager createDirectoryAtPath:sibling withIntermediateDirectories:YES attributes:nil error:nil];[cubeData writeToFile:[sibling stringByAppendingPathComponent:@"Sibling.cube"]atomically:YES];[library reload:nil]; + [browser performSelector:@selector(rebuildFolders)];[browser layoutBrowser]; + require([[browser valueForKey:@"folderPaths"]containsObject:@"胶片/人像"]&&[[browser valueForKey:@"folderPaths"]containsObject:@"胶片/人像/柔和"],@"all local directory levels are available in sidebar"); + local.identifier=@"胶片/人像";[browser folderClicked:local];require([[browser valueForKey:@"visibleEntries"]count]==1,@"local parent includes descendants and excludes prefix siblings"); + id branch=nil;for(NSButton *b in [browser valueForKey:@"folderButtons"])if([b.identifier isEqual:@"胶片/人像"])branch=b; + require([[branch valueForKey:@"depth"]integerValue]==1&&[[branch valueForKey:@"branch"]boolValue],@"second-level parent is indented and expandable"); + [branch setValue:@YES forKey:@"disclosureClicked"];[browser folderClicked:branch];[branch setValue:@NO forKey:@"disclosureClicked"]; + require(![[browser valueForKey:@"folderPaths"]containsObject:@"胶片/人像/柔和"],@"collapsing local parent hides descendants"); + [branch setValue:@YES forKey:@"disclosureClicked"];[browser folderClicked:branch];[branch setValue:@NO forKey:@"disclosureClicked"]; + require([[browser valueForKey:@"folderPaths"]containsObject:@"胶片/人像/柔和"],@"expanding local parent restores descendants"); + [browser close];NSUInteger closedRequests=requests.count;[browser release]; + pump(^{return activePreviews==0;});require(requests.count==closedRequests,@"closing stops all preview work without scheduling more uploads"); + [library release];[applied release];[installed release]; [NSFileManager.defaultManager removeItemAtURL:root error:nil]; for(NSString *key in NSUserDefaults.standardUserDefaults.dictionaryRepresentation.allKeys)if([key containsString:root.path])[NSUserDefaults.standardUserDefaults removeObjectForKey:key]; NSDictionary *report=@{@"pass":@YES,@"count":@(checks.count),@"checks":checks,@"scope":@"Isolated AppKit browser with simulated network replies; real Cube validation/import; no user credentials, no production frame upload, no visible test app."}; diff --git a/verification/UnifiedLUTBrowser1.22.1.json b/verification/UnifiedLUTBrowser1.22.1.json new file mode 100644 index 0000000..ff1e100 --- /dev/null +++ b/verification/UnifiedLUTBrowser1.22.1.json @@ -0,0 +1,243 @@ +{ + "scope" : "Isolated AppKit browser with simulated network replies; real Cube validation\/import; no user credentials, no production frame upload, no visible test app.", + "count" : 59, + "pass" : true, + "checks" : [ + { + "name" : "valid online LUT imports", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "server names cannot escape local library", + "pass" : true + }, + { + "name" : "repeat online download reuses matching local file", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "repeat imports do not create duplicate LUTs", + "pass" : true + }, + { + "name" : "checksum mismatch rejected before library changes", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "existing local LUT preserved after rejected download", + "pass" : true + }, + { + "name" : "cancelled online import reports cancellation", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "acceptance never displays an unsigned test app", + "pass" : true + }, + { + "name" : "constructing an unopened browser never uploads a frame", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "opening local library also preloads the online page", + "pass" : true + }, + { + "name" : "opening browser automatically uploads cached frame and previews the whole online page", + "pass" : true + }, + { + "name" : "local and online categories share one sidebar with separate stable identities", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "optional refresh action has an accurate accessibility label", + "pass" : true + }, + { + "name" : "switching to online root reuses the automatically generated previews", + "pass" : true + }, + { + "name" : "online total and pagination remain visible", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "next page requests page two", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "online child category is sent to server without sidebar prefix", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "browser limits simultaneous remote preview work", + "pass" : true + }, + { + "name" : "frame request sends image pixels without project paths or filenames", + "pass" : true + }, + { + "name" : "uploaded frame preserves timeline aspect", + "pass" : true + }, + { + "name" : "new timeline frames never trigger automatic uploads", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "downloaded verified LUT is applied through local host selection", + "pass" : true + }, + { + "name" : "clicked online LUT installs into its local category", + "pass" : true + }, + { + "name" : "download immediately adds the second-level local category to the same sidebar", + "pass" : true + }, + { + "name" : "same-time host redraw cannot regrade the online upload reference", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "comparison displays LUT title without internal identifier", + "pass" : true + }, + { + "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 + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "incomplete download produces a visible error", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "permission rejection removes online entries", + "pass" : true + }, + { + "name" : "local LUT library remains usable without online permission", + "pass" : true + }, + { + "name" : "local reveal button is restored after an online empty page or error", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "local selection resets previous online highlight", + "pass" : true + }, + { + "name" : "all local directory levels are available in sidebar", + "pass" : true + }, + { + "name" : "local parent includes descendants and excludes prefix siblings", + "pass" : true + }, + { + "name" : "second-level parent is indented and expandable", + "pass" : true + }, + { + "name" : "collapsing local parent hides descendants", + "pass" : true + }, + { + "name" : "expanding local parent restores descendants", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "closing stops all preview work without scheduling more uploads", + "pass" : true + } + ] +} \ No newline at end of file diff --git a/大鱼调色/Plugin/DYLUTBrowser.mm b/大鱼调色/Plugin/DYLUTBrowser.mm index 0d40161..68019c6 100644 --- a/大鱼调色/Plugin/DYLUTBrowser.mm +++ b/大鱼调色/Plugin/DYLUTBrowser.mm @@ -22,6 +22,9 @@ static NSString *const DYBrowserFramePreference=@"com.dayu.color.lookLUTPreview. static NSString *const DYBrowserLayoutPreference=@"com.dayu.color.lookLUTPreview.layout"; static NSString *const DYBrowserSidebarPreference=@"com.dayu.color.lookLUTPreview.sidebarWidth"; static NSString *const DYBrowserRecentFolder=@"@recent"; +static NSString *const DYBrowserOnlineFolder=@"@online"; +static NSString *const DYBrowserOnlineCategoryPrefix=@"@online/"; +static BOOL DYBrowserIsOnlineFolder(NSString *folder){return [folder isEqual:DYBrowserOnlineFolder]||[folder hasPrefix:DYBrowserOnlineCategoryPrefix];} static NSString *DYBrowserPreference(NSString *key,DYLUTLibrary *library){return [NSString stringWithFormat:@"%@|%@",key,library.rootURL.path];} // Opt-in, local-only geometry samples. No LUT names, paths or image data. @@ -123,7 +126,7 @@ static NSRect DYBrowserTileImageRect(NSRect bounds,BOOL list) { [NSGraphicsContext restoreGraphicsState]; }else{ [DYBrowserColor(_palette,@"background")setFill];NSRectFill(imageRect); - NSString *message=_failure.length?@"无法预览":_online?@"点“预览当前帧”":@"生成预览…"; + NSString *message=_failure.length?@"无法预览":_online?@"加载在线预览…":@"生成预览…"; NSDictionary *attributes=@{NSFontAttributeName:[NSFont systemFontOfSize:11],NSForegroundColorAttributeName:DYBrowserColor(_palette,@"secondary")}; NSSize size=[message sizeWithAttributes:attributes]; [message drawAtPoint:NSMakePoint(NSMidX(imageRect)-size.width/2,NSMidY(imageRect)-size.height/2) withAttributes:attributes]; @@ -138,6 +141,8 @@ static NSRect DYBrowserTileImageRect(NSRect bounds,BOOL list) { @interface DYBrowserFolderButton : NSButton @property(copy) NSDictionary *palette; @property BOOL chosen; +@property NSUInteger depth; +@property BOOL branch,expanded,disclosureClicked; @end @implementation DYBrowserFolderButton - (BOOL)isFlipped{return YES;} @@ -145,8 +150,13 @@ static NSRect DYBrowserTileImageRect(NSRect bounds,BOOL list) { - (void)drawRect:(NSRect)dirty{ if(_chosen){[DYBrowserColor(_palette,@"field")setFill];[[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds,1,1) xRadius:5 yRadius:5]fill];} NSMutableParagraphStyle *paragraph=[[[NSMutableParagraphStyle alloc]init]autorelease];paragraph.lineBreakMode=NSLineBreakByTruncatingMiddle; - [self.title drawInRect:NSInsetRect(self.bounds,9,8) withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:11 weight:_chosen?NSFontWeightSemibold:NSFontWeightRegular],NSForegroundColorAttributeName:DYBrowserColor(_palette,_chosen?@"accent":@"text"),NSParagraphStyleAttributeName:paragraph}]; + CGFloat inset=9+_depth*14; + NSDictionary *attributes=@{NSFontAttributeName:[NSFont systemFontOfSize:11 weight:_chosen?NSFontWeightSemibold:NSFontWeightRegular],NSForegroundColorAttributeName:DYBrowserColor(_palette,_chosen?@"accent":@"text"),NSParagraphStyleAttributeName:paragraph}; + if(_branch)[(_expanded?@"▾":@"▸") drawAtPoint:NSMakePoint(inset,8) withAttributes:attributes]; + [self.title drawInRect:NSMakeRect(inset+14,8,MAX(1,NSWidth(self.bounds)-inset-19),18) withAttributes:attributes]; } +- (void)mouseDown:(NSEvent *)event{NSPoint p=[self convertPoint:event.locationInWindow fromView:nil];_disclosureClicked=_branch&&p.x<23+_depth*14;[super mouseDown:event];_disclosureClicked=NO;} +- (void)keyDown:(NSEvent *)event{if(_branch&&((event.keyCode==123&&_expanded)||(event.keyCode==124&&!_expanded))){_disclosureClicked=YES;[self performClick:nil];_disclosureClicked=NO;}else [super keyDown:event];} @end @interface DYBrowserCompareView : NSView @@ -245,17 +255,21 @@ static NSRect DYBrowserTileImageRect(NSRect bounds,BOOL list) { NSUInteger _libraryGeneration,_selectionGeneration,_previewGeneration; NSInteger _columns; CGFloat _tileWidth,_tileHeight,_sidebarWidth; - NSPopUpButton *_sourceMenu; NSButton *_previousPage; NSTextField *_onlineNotice; BOOL _onlineMode; NSArray *_onlineEntries,*_onlineCategories; NSDictionary *_onlineFrame; NSData *_onlinePNG; - NSString *_onlineSelectedPath,*_localFolder; + NSString *_onlineSelectedPath; NSUInteger _onlinePage,_onlineTotal,_onlineCatalogGeneration; NSProgress *_onlineCatalogTask; NSMutableSet *_onlineTransfers; + NSMutableSet *_collapsedFolders,*_onlineQueuedPaths; + NSCache *_onlineThumbnailCache; + DYBrowserWork *_onlineWork; + BOOL _onlineStarted,_onlineFramePreparing; + NSUInteger _onlineFrameGeneration; } @end @@ -278,14 +292,15 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b if(!library.recentPaths.count&&path.length)[library recordUsedPath:path]; if(!savedFolder)savedFolder=library.recentPaths.count?DYBrowserRecentFolder:@"*"; _library=[library retain];_previewFrames=[frames copy];_previewGeneration=1;_recentSnapshot=[library.recentPaths copy];_selectedPath=[path copy];_folder=[(savedFolder?:@"*") copy];_selection=[selection copy]; + _onlineMode=DYBrowserIsOnlineFolder(_folder);_collapsedFolders=[NSMutableSet new]; _folderButtons=[NSMutableArray new];_tiles=[NSMutableDictionary new];_queuedPaths=[NSMutableSet new];_thumbnailCache=[NSCache new];_thumbnailCache.countLimit=600;_thumbnailCache.totalCostLimit=64*1024*1024;_previewQueue=dispatch_queue_create("com.dayu.color.lut-thumbnails",DISPATCH_QUEUE_SERIAL);dispatch_set_target_queue(_previewQueue,dispatch_get_global_queue(QOS_CLASS_UTILITY,0)); panel.title=@"风格 LUT";panel.contentMinSize=self.class.minimumContentSize;panel.contentMaxSize=self.class.maximumContentSize;panel.releasedWhenClosed=NO;panel.hidesOnDeactivate=NO;panel.delegate=self; _root=[[DYBrowserCanvas alloc]initWithFrame:NSMakeRect(0,0,760,560)];_root.accessibilityLabel=@"LUT 缩略图浏览库";panel.contentView=_root; - _titleLabel=[BrowserLabel(@"LUT 文件夹",14)retain];_titleLabel.font=[NSFont systemFontOfSize:14 weight:NSFontWeightSemibold]; - _sourceMenu=[[NSPopUpButton alloc]initWithFrame:NSZeroRect pullsDown:NO];[_sourceMenu addItemsWithTitles:@[@"本地 LUT",@"在线 LUT"]];_sourceMenu.target=self;_sourceMenu.action=@selector(sourceChanged:);_sourceMenu.accessibilityLabel=@"LUT 来源"; + _titleLabel=[BrowserLabel(@"LUT 浏览器",14)retain];_titleLabel.font=[NSFont systemFontOfSize:14 weight:NSFontWeightSemibold]; _previousPage=[BrowserButton(@"上一页",self,@selector(previousOnlinePage:))retain];_previousPage.hidden=YES; - _onlineNotice=[BrowserLabel(@"点“预览当前帧”将缩略图发送到 dayu.media,仅供本次处理,不保存帧。",11)retain];_onlineNotice.hidden=YES; + _onlineNotice=[BrowserLabel(@"打开时自动上传缓存帧缩略图用于在线预览;服务器不保存帧。",11)retain];_onlineNotice.hidden=YES; _onlinePage=1;_onlineTransfers=[NSMutableSet new]; + _onlineQueuedPaths=[NSMutableSet new];_onlineThumbnailCache=[NSCache new];_onlineThumbnailCache.countLimit=600;_onlineThumbnailCache.totalCostLimit=64*1024*1024; [NSDistributedNotificationCenter.defaultCenter addObserver:self selector:@selector(onlineIdentityChanged:) name:DYOnlineLUTIdentityChanged object:nil]; _countLabel=[BrowserLabel(@"0 个 LUT",11)retain]; _statusLabel=[BrowserLabel(@"单击缩略图应用 LUT",11)retain]; @@ -330,20 +345,22 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(gridScrolled:) name:NSViewBoundsDidChangeNotification object:_gridScroll.contentView]; _splitView=[[NSSplitView alloc]initWithFrame:NSMakeRect(12,80,736,425)];_splitView.vertical=YES;_splitView.dividerStyle=NSSplitViewDividerStyleThin;_splitView.accessibilityLabel=@"调整 LUT 文件夹与预览宽度"; _folderScroll.frame=NSMakeRect(0,0,162,425);_gridScroll.frame=NSMakeRect(163,0,573,425);[_splitView addSubview:_folderScroll];[_splitView addSubview:_gridScroll]; - for(NSView *view in @[_titleLabel,_sourceMenu,_previousPage,_onlineNotice,_countLabel,_statusLabel,_sizeLabel,_search,_importFiles,_importFolder,_reveal,_refresh,_none,_done,_hd,_sizeSlider,_layoutMenu,_splitView,_comparePanel])[_root addSubview:view]; + for(NSView *view in @[_titleLabel,_previousPage,_onlineNotice,_countLabel,_statusLabel,_sizeLabel,_search,_importFiles,_importFolder,_reveal,_refresh,_none,_done,_hd,_sizeSlider,_layoutMenu,_splitView,_comparePanel])[_root addSubview:view]; [_gridDocument addSubview:_emptyLabel]; _root.postsFrameChangedNotifications=YES;_root.postsBoundsChangedNotifications=YES; [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(browserRootResized:) name:NSViewFrameDidChangeNotification object:_root]; [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(browserRootResized:) name:NSViewBoundsDidChangeNotification object:_root]; - _splitView.delegate=self;[self reloadLibrary:nil];[self updatePalette:palette];[self layoutBrowser]; + _splitView.delegate=self;[self updateSourceControls];[self reloadLibrary:nil];[self updatePalette:palette];[self layoutBrowser]; } return self; } - (void)dealloc{ [NSDistributedNotificationCenter.defaultCenter removeObserver:self]; [_onlineCatalogTask cancel];[_onlineCatalogTask release];for(NSProgress *task in _onlineTransfers)[task cancel];[_onlineTransfers release]; - [_onlineEntries release];[_onlineCategories release];[_onlineFrame release];[_onlinePNG release];[_onlineSelectedPath release];[_localFolder release]; - [_sourceMenu release];[_previousPage release];[_onlineNotice release]; + _onlineWork.cancelled=YES;_onlineWork.owner=nil;[_onlineWork release]; + [_collapsedFolders release];[_onlineQueuedPaths release];[_onlineThumbnailCache release]; + [_onlineEntries release];[_onlineCategories release];[_onlineFrame release];[_onlinePNG release];[_onlineSelectedPath release]; + [_previousPage release];[_onlineNotice release]; [_recentSnapshot release]; [NSObject cancelPreviousPerformRequestsWithTarget:self];[[NSNotificationCenter defaultCenter]removeObserver:self]; [_libraryTask cancel];[_libraryTask release];[_selectionTask cancel];[_selectionTask release];[_progressTimer invalidate];[_progressTimer release]; @@ -365,7 +382,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b _popover=[[NSPopover alloc]init];_popover.behavior=NSPopoverBehaviorSemitransient;_popover.animates=YES;_popover.delegate=self;_popover.contentSize=size; NSViewController *controller=[[[NSViewController alloc]init]autorelease];controller.title=@"风格 LUT";controller.view=_root;_popover.contentViewController=controller; [self layoutBrowser]; - @try {[_popover showRelativeToRect:view.bounds ofView:view preferredEdge:NSRectEdgeMaxX];_visible=_popover.shown;[self refreshComparison];} + @try {[_popover showRelativeToRect:view.bounds ofView:view preferredEdge:NSRectEdgeMaxX];_visible=_popover.shown;[self startOnlinePreviews];[self refreshComparison];} @catch(NSException *exception){[self finishClosing];} } - (BOOL)visible{return !_closed&&((_remoteMode||_detached)?_visible:_popover.shown);} @@ -379,6 +396,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b parent.postsFrameChangedNotifications=YES;parent.postsBoundsChangedNotifications=YES; for(NSNotificationName name in @[NSViewFrameDidChangeNotification,NSViewBoundsDidChangeNotification])[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(remoteParentGeometryChanged:) name:name object:parent]; [parent addSubview:_root];DYBrowserGeometrySample(_root,@"before-content-origin-alignment");[self fitRemoteParent]; + [self startOnlinePreviews]; DYBrowserGeometrySample(_root,@"attached-before-sdk-reply"); // Attach synchronously: the SDK reads the first child before reply returns. dispatch_async(dispatch_get_main_queue(),^{if(!_closed){[self configurePresentationWindow];[self refreshComparison];DYBrowserGeometrySample(_root,@"after-sdk-reply");}}); @@ -389,12 +407,12 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b _embedded=YES;_folderScroll.hasVerticalScroller=YES;_gridScroll.hasVerticalScroller=YES;_gridScroll.hasHorizontalScroller=NO;_gridScroll.scrollerStyle=NSScrollerStyleOverlay;[self showInRemoteParent:parent close:closeAction];_done.title=@"返回调整"; } - (void)embedRecentInView:(NSView *)parent{ - _compactRecent=YES;_embedded=YES; + _compactRecent=YES;_embedded=YES;_onlineMode=NO; [_folder release];_folder=[DYBrowserRecentFolder copy]; _root.accessibilityLabel=@"最近使用 LUT 快捷入口"; _titleLabel.stringValue=@"最近使用";_titleLabel.font=[NSFont systemFontOfSize:11 weight:NSFontWeightSemibold]; [_layoutMenu selectItemAtIndex:0];_sizeSlider.doubleValue=120; - for(NSView *view in @[_sourceMenu,_previousPage,_onlineNotice,_search,_importFiles,_importFolder,_reveal,_refresh,_none,_done,_hd,_comparePanel,_sizeLabel,_sizeSlider,_layoutMenu,_splitView])view.hidden=YES; + for(NSView *view in @[_previousPage,_onlineNotice,_search,_importFiles,_importFolder,_reveal,_refresh,_none,_done,_hd,_comparePanel,_sizeLabel,_sizeSlider,_layoutMenu,_splitView])view.hidden=YES; [_root addSubview:_gridScroll];_gridScroll.hasHorizontalScroller=NO;_gridScroll.scrollerStyle=NSScrollerStyleOverlay; [self showInRemoteParent:parent close:nil];[self rebuildGrid];[self refreshRecentSelection:_selectedPath]; } @@ -512,7 +530,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b if(!small){_sizeLabel.frame=NSMakeRect(174,h-29,68,18);_sizeSlider.frame=NSMakeRect(246,h-31,100,20);_statusLabel.frame=NSMakeRect(444,h-29,MAX(0,w-540),18);} } NSRect browser=_splitView.frame,comparison=browser; - _sourceMenu.hidden=NO;_titleLabel.hidden=YES;_sourceMenu.frame=NSMakeRect(12,_embedded?6:10,145,26); + _titleLabel.hidden=NO;_titleLabel.frame=NSMakeRect(12,_embedded?8:12,145,20); _countLabel.frame=NSMakeRect(165,_embedded?10:14,MAX(60,w-350),18); _onlineNotice.hidden=!_onlineMode;_previousPage.hidden=!_onlineMode; if(_onlineMode){ @@ -564,7 +582,6 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b } - (void)layoutChanged:(id)sender{[NSUserDefaults.standardUserDefaults setInteger:_layoutMenu.indexOfSelectedItem forKey:DYBrowserPreference(DYBrowserLayoutPreference,_library)];[self layoutBrowser];} - (void)resetThumbnailWork { - for(NSProgress *task in _onlineTransfers)[task cancel];[_onlineTransfers removeAllObjects]; _work.cancelled=YES;_work.owner=nil;[_work release];_work=[DYBrowserWork new];_work.owner=self;[_queuedPaths removeAllObjects]; } - (void)updateVisibleTiles { @@ -627,11 +644,12 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b [_selectionFrameTime release];_selectionFrameTime=nil; // Online uploads retain the same pre-application reference as local previews. // Only a new playhead time may replace it after applying a look. - if(_onlineMode){NSDictionary *snapshot=[frames copy];[_previewFrames release];_previewFrames=snapshot;return;} + if(_onlineMode){NSDictionary *snapshot=[frames copy];[_previewFrames release];_previewFrames=snapshot;if(_onlineStarted&&!_onlineFrame&&!_onlineFramePreparing)[self captureOnlineFrame];return;} NSData *current=_previewFrames[currentQuality],*next=frames[nextQuality]; BOOL unchanged=sameSize&&[current isEqualToData:next]; NSDictionary *snapshot=[frames copy]; [_previewFrames release];_previewFrames=snapshot; + if(_onlineStarted&&!_onlineFrame&&!_onlineFramePreparing)[self captureOnlineFrame]; if(unchanged)return; [self invalidatePreviewImages]; [self layoutBrowser]; @@ -639,11 +657,12 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b - (void)qualityChanged:(id)sender{ [NSUserDefaults.standardUserDefaults setBool:_hd.state==NSControlStateValueOn forKey:DYBrowserPreference(DYBrowserHDPreference,_library)]; [self invalidatePreviewImages]; - if(_onlineMode){[_onlinePNG release];_onlinePNG=nil;[_onlineFrame release];_onlineFrame=nil;[self setStatus:@"画质已切换,请重新点击预览当前帧。"];} + if(_onlineMode)[self captureOnlineFrame]; [self layoutBrowser]; } - (void)comparePositionChanged:(id)sender{_compareView.position=_compareSlider.doubleValue;} - (NSDictionary *)previewResultForPath:(NSString *)path{ + if([path hasPrefix:@"online:"])return [_onlineThumbnailCache objectForKey:path]; DYBrowserTile *tile=_tiles[path]; if(tile.previewGeneration==_previewGeneration){ if(tile.thumbnail)return @{@"image":tile.thumbnail}; @@ -700,10 +719,15 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b } - (void)setStatus:(NSString *)status{_statusLabel.stringValue=status?:@"";_statusLabel.toolTip=status;} - (void)rebuildFolders{ - if(_onlineMode){NSMutableArray *paths=[NSMutableArray arrayWithObject:@"*"];[paths addObjectsFromArray:_onlineCategories?:@[]];if(![paths containsObject:_folder]){[_folder release];_folder=[@"*" copy];}[_folderPaths release];_folderPaths=[paths copy];[self updateVisibleFolders];return;} NSMutableArray *paths=[NSMutableArray arrayWithObjects:DYBrowserRecentFolder,@"*",nil];NSMutableSet *seen=[NSMutableSet setWithArray:paths]; - for(NSString *folder in _library.folders){NSString *top=folder.length?[folder componentsSeparatedByString:@"/"].firstObject:@"";if(![seen containsObject:top]){[paths addObject:top];[seen addObject:top];}} - if(![seen containsObject:_folder]){[_folder release];_folder=[@"*" copy];} + for(NSString *folder in _library.folders){ + [seen addObject:folder];BOOL hidden=NO;NSString *parent=folder.stringByDeletingLastPathComponent; + while(parent.length){if([_collapsedFolders containsObject:parent]){hidden=YES;break;}parent=parent.stringByDeletingLastPathComponent;} + if(!hidden)[paths addObject:folder]; + } + [paths addObject:DYBrowserOnlineFolder];[seen addObject:DYBrowserOnlineFolder]; + for(NSString *category in _onlineCategories){NSString *path=[DYBrowserOnlineCategoryPrefix stringByAppendingString:category];[seen addObject:path];if(![_collapsedFolders containsObject:DYBrowserOnlineFolder])[paths addObject:path];} + if(![seen containsObject:_folder]&&!DYBrowserIsOnlineFolder(_folder)){[_folder release];_folder=[@"*" copy];} [_folderPaths release];_folderPaths=[paths copy];[self updateVisibleFolders]; } - (void)folderScrolled:(NSNotification *)notification{if(!_layingOut)[self updateVisibleFolders];} @@ -714,8 +738,14 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b NSMutableArray *buttons=[NSMutableArray array]; for(NSUInteger i=first;i_onlineEntries release];self->_onlineEntries=nil;[self->_onlineCategories release];self->_onlineCategories=nil; [self->_onlineSelectedPath release];self->_onlineSelectedPath=nil; [self invalidatePreviewImages]; - if(self->_onlineMode){[self rebuildFolders];[self rebuildGrid];[self loadOnlineCatalog];} + [self rebuildFolders];[self rebuildGrid];if(self->_onlineStarted){[self captureOnlineFrame];[self loadOnlineCatalog];} }); } - (void)previousOnlinePage:(id)sender {if(_onlineMode&&_onlinePage>1){_onlinePage--;[self loadOnlineCatalog];}} - (void)debouncedOnlineSearch {if(_onlineMode&&!_closed){_onlinePage=1;[self loadOnlineCatalog];}} - (void)loadOnlineCatalog { - if(!_onlineMode||_closed)return; + if(!_onlineStarted||_closed)return; NSUInteger generation=++_onlineCatalogGeneration;[_onlineCatalogTask cancel];[_onlineCatalogTask release];_onlineCatalogTask=nil; [self setStatus:@"正在加载在线 LUT…"];_previousPage.enabled=NO;_reveal.enabled=NO; - NSDictionary *body=@{@"page":@(_onlinePage),@"category":[_folder isEqual:@"*"]?@"":_folder,@"search":_search.stringValue?:@""}; + NSString *category=[_folder hasPrefix:DYBrowserOnlineCategoryPrefix]?[_folder substringFromIndex:DYBrowserOnlineCategoryPrefix.length]:@""; + NSDictionary *body=@{@"page":@(_onlineMode?_onlinePage:1),@"category":category,@"search":_onlineMode?(_search.stringValue?:@""):@""}; NSProgress *task=[DYOnlineLUTClient request:@"/dayu-color/v1/lut/catalog" body:body authenticated:YES completion:^(NSData *data,NSError *error){ - if(self->_closed||!self->_onlineMode||generation!=self->_onlineCatalogGeneration)return; + if(self->_closed||generation!=self->_onlineCatalogGeneration)return; [self->_onlineCatalogTask release];self->_onlineCatalogTask=nil; NSDictionary *value=[DYOnlineLUTClient JSON:data error:&error]; if(error||![value[@"items"]isKindOfClass:NSArray.class]||![value[@"categories"]isKindOfClass:NSArray.class]){ - [self->_onlineEntries release];self->_onlineEntries=nil;[self rebuildGrid];[self setStatus:error.localizedDescription?:@"在线目录格式无效。"];self->_emptyLabel.stringValue=error.localizedDescription?:@"请刷新在线目录。";return; + [self->_onlineEntries release];self->_onlineEntries=nil;if(self->_onlineMode){[self rebuildGrid];[self setStatus:error.localizedDescription?:@"在线目录格式无效。"];self->_emptyLabel.stringValue=error.localizedDescription?:@"请刷新在线目录。";}return; } NSMutableArray *entries=[NSMutableArray array],*categories=[NSMutableArray array]; for(id category in value[@"categories"])if([category isKindOfClass:NSString.class]&&[category length]<=191)[categories addObject:category]; @@ -890,8 +931,9 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b } [self->_onlineEntries release];self->_onlineEntries=[entries copy];[self->_onlineCategories release];self->_onlineCategories=[categories copy]; self->_onlineTotal=[value[@"total"]isKindOfClass:NSNumber.class]?MAX(0,[value[@"total"]integerValue]):entries.count; - self->_previousPage.enabled=self->_onlinePage>1;self->_reveal.enabled=self->_onlinePage*60_onlineTotal; - [self rebuildFolders];[self rebuildGrid];[self setStatus:@"点选下载并应用;预览当前帧可在线生成效果图。"]; + self->_previousPage.enabled=self->_onlinePage>1;[self updateSourceControls]; + [self rebuildFolders];if(self->_onlineMode){[self rebuildGrid];[self setStatus:@"自动加载在线预览;点击安装到本地分类并应用。"]; }else [self layoutBrowser]; + [self generateOnlinePreviews]; }]; _onlineCatalogTask=[task retain]; } @@ -899,42 +941,54 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b for(NSDictionary *entry in _onlineEntries)if([entry[@"path"]isEqual:path])return entry;return nil; } - (void)captureOnlineFrame { - if(!_onlineMode||_closed)return; + if(!_onlineStarted||_closed||_compactRecent)return; NSString *quality=[self previewQualityForFrames:_previewFrames];NSData *pixels=_previewFrames[quality];NSValue *value=_previewFrames[[quality stringByAppendingString:@"Size"]]; NSSize size=value?value.sizeValue:NSZeroSize; - if(!pixels.length||size.width<1||size.height<1||pixels.length!=(NSUInteger)(size.width*size.height)*16){[self setStatus:@"暂无时间线帧,请先移动播放头或播放片段再重试。"];return;} - [self invalidatePreviewImages];[_onlinePNG release];_onlinePNG=nil;[_onlineFrame release];_onlineFrame=[_previewFrames copy]; - DYBrowserWork *work=_work;[self setStatus:@"正在准备当前帧缩略图…"]; + if(!pixels.length||size.width<1||size.height<1||pixels.length!=(NSUInteger)(size.width*size.height)*16){if(_onlineMode)[self setStatus:@"等待时间线缓存帧,收到后将自动预览。"];return;} + NSUInteger generation=++_onlineFrameGeneration;_onlineFramePreparing=YES; + [self resetOnlinePreviewWork];[_onlineThumbnailCache removeAllObjects]; + [_onlinePNG release];_onlinePNG=nil;[_onlineFrame release];_onlineFrame=[_previewFrames copy]; + if(_onlineMode){[self invalidatePreviewImages];for(DYBrowserTile *tile in _tiles.allValues){tile.thumbnail=nil;tile.failure=nil;tile.previewGeneration=0;[tile setNeedsDisplay:YES];}[_compareView setOriginal:nil styled:nil];_compareSlider.enabled=NO;} + DYBrowserWork *work=_onlineWork;if(_onlineMode)[self setStatus:@"正在准备当前缓存帧缩略图…"]; dispatch_async(_previewQueue,^{@autoreleasepool{ - if(work.cancelled)return;NSError *error=nil;CGFloat scale=MIN(1.,sqrt(230400./(size.width*size.height))); + if(work.cancelled)return;NSError *error=nil; + CGFloat scale=MIN(1.,MIN(640./MAX(size.width,size.height),sqrt(230400./(size.width*size.height)))); NSSize output=NSMakeSize(MAX(1,floor(size.width*scale)),MAX(1,floor(size.height*scale))); NSImage *image=DYLUTThumbnail(nil,pixels,size.width,size.height,output,&error); NSBitmapImageRep *bitmap=(NSBitmapImageRep *)image.representations.firstObject; NSData *png=[bitmap isKindOfClass:NSBitmapImageRep.class]?[bitmap representationUsingType:NSBitmapImageFileTypePNG properties:@{}]:nil; - dispatch_async(dispatch_get_main_queue(),^{DYLUTBrowser *owner=work.owner;if(!owner||work.cancelled)return; - if(!png||png.length>1500000){[owner setStatus:error.localizedDescription?:@"当前帧缩略图无法用于在线预览。"];return;} - owner->_onlinePNG=[png copy];[owner setStatus:@"正在上传缩略图并生成在线效果预览…"];[owner generateVisibleThumbnails];[owner refreshComparison]; + dispatch_async(dispatch_get_main_queue(),^{DYLUTBrowser *owner=work.owner;if(!owner||work.cancelled||generation!=owner->_onlineFrameGeneration)return; + owner->_onlineFramePreparing=NO; + if(!png||png.length>1500000){[owner->_onlineFrame release];owner->_onlineFrame=nil;if(owner->_onlineMode)[owner setStatus:error.localizedDescription?:@"当前帧缩略图无法用于在线预览。"];return;} + owner->_onlinePNG=[png copy];if(owner->_onlineMode)[owner setStatus:@"正在上传缓存帧并批量生成在线预览…"]; + [owner generateOnlinePreviews];[owner layoutBrowser];[owner refreshComparison]; }); }}); } +- (void)generateOnlinePreviews { + if(!_onlinePNG||_closed||!_onlineStarted)return; + // Prioritize on-screen results, then preload the remainder of this page. + if(_onlineMode)for(NSDictionary *entry in _visibleEntries)if(_tiles[entry[@"path"]]&&![self previewResultForPath:entry[@"path"]])[self requestOnlinePreview:entry[@"path"]]; + for(NSDictionary *entry in _onlineEntries)if(![self previewResultForPath:entry[@"path"]])[self requestOnlinePreview:entry[@"path"]]; +} - (void)requestOnlinePreview:(NSString *)path { - if(!_onlinePNG||!_work||[_queuedPaths containsObject:path]||_onlineTransfers.count>=2)return; + if(!_onlinePNG||!_onlineWork||_onlineWork.cancelled||[_onlineQueuedPaths containsObject:path]||[_onlineThumbnailCache objectForKey:path]||_onlineTransfers.count>=2)return; NSDictionary *entry=[self onlineEntryForPath:path];if(!entry)return; - [_queuedPaths addObject:path];DYBrowserWork *work=_work; + [_onlineQueuedPaths addObject:path];DYBrowserWork *work=_onlineWork; __block NSProgress *task=nil; task=[DYOnlineLUTClient request:[NSString stringWithFormat:@"/dayu-color/v1/lut/%@/preview",entry[@"id"]] body:@{@"frame_png":[_onlinePNG base64EncodedStringWithOptions:0]} authenticated:YES completion:^(NSData *data,NSError *error){ DYLUTBrowser *owner=work.owner;if(!owner||work.cancelled)return; - if(task)[owner->_onlineTransfers removeObject:task];[owner->_queuedPaths removeObject:path]; + if(task)[owner->_onlineTransfers removeObject:task];[owner->_onlineQueuedPaths removeObject:path]; NSImage *image=nil; if(!error&&data.length>24&&!memcmp(data.bytes,"\x89PNG\r\n\x1a\n",8)){ uint32_t width=0,height=0;memcpy(&width,(const uint8_t *)data.bytes+16,4);memcpy(&height,(const uint8_t *)data.bytes+20,4);width=CFSwapInt32BigToHost(width);height=CFSwapInt32BigToHost(height); if(width&&height&&width<=640&&height<=640&&(uint64_t)width*height<=230400)image=[[[NSImage alloc]initWithData:data]autorelease]; } NSDictionary *result=image?@{@"image":image}:@{@"error":error.localizedDescription?:@"服务器未返回有效的预览图。"}; - [owner->_thumbnailCache setObject:result forKey:path cost:image?data.length:128]; + [owner->_onlineThumbnailCache setObject:result forKey:path cost:image?data.length:128]; DYBrowserTile *tile=owner->_tiles[path];if(tile)[owner displayPreviewResult:result inTile:tile]; - [owner refreshComparison];[owner generateVisibleThumbnails]; - if(error)[owner setStatus:error.localizedDescription];else [owner setStatus:@"在线预览已更新;点击 LUT 下载并应用。"]; + [owner refreshComparison];[owner generateOnlinePreviews]; + if(owner->_onlineMode){if(error)[owner setStatus:error.localizedDescription];else [owner setStatus:@"在线预览已更新;点击安装到本地分类并应用。"]; } }]; if(task)[_onlineTransfers addObject:task]; } @@ -950,6 +1004,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b self->_selectionTask=[[self->_library importOnlineData:data identifier:entry[@"id"] name:name category:entry[@"category"] checksum:entry[@"checksum"] completion:^(NSString *path,NSError *failure){ if(self->_closed||generation!=self->_selectionGeneration)return;[self->_selectionTask release];self->_selectionTask=nil; if(failure||!path){[self setStatus:failure.localizedDescription?:@"LUT 保存失败。"];return;} + [self rebuildFolders];[self layoutBrowser]; void (^applied)(NSError *)=^(NSError *applyError){ if(self->_closed||generation!=self->_selectionGeneration)return;[self->_selectionTask release];self->_selectionTask=nil; if(applyError){[self setStatus:applyError.localizedDescription];return;} @@ -957,7 +1012,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b [self->_onlineSelectedPath release];self->_onlineSelectedPath=[onlinePath copy]; [self->_selectionFrameTime release];self->_selectionFrameTime=[self->_previewFrames[@"time"]retain]; for(DYBrowserTile *button in self->_tiles.allValues){button.chosen=[button.identifier isEqual:onlinePath];[button setNeedsDisplay:YES];} - [self refreshComparison];[self setStatus:[@"已下载并应用 " stringByAppendingString:name]];if(closeAfter)[self close]; + [self refreshComparison];[self setStatus:[@"已安装到本地分类并应用:" stringByAppendingString:name]];if(closeAfter)[self close]; }; self->_selectionTask=[(self->_selection?self->_selection(path,applied):DYLUTPrepareAsync(path,applied))retain]; }]retain]; diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 22461c7..35bc965 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.22.0 + 1.22.1 CFBundleVersion - 131 + 132 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/AppDelegate.m b/大鱼调色/Wrapper Application/AppDelegate.m index f2a4949..8b54f0a 100644 --- a/大鱼调色/Wrapper Application/AppDelegate.m +++ b/大鱼调色/Wrapper Application/AppDelegate.m @@ -261,7 +261,7 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe self.accessButton=DYButton(@"刷新权限",DYBlue(),NO,self,@selector(refreshOnlineAccount:)); self.logoutButton=DYButton(@"退出登录",DYSecondary(),NO,self,@selector(logoutOnlineAccount:)); DYSurface *accountCard=DYCard(DYBlue(),DYStack(@[DYHeading(@"person.crop.circle",@"大鱼账号 · 在线 LUT",DYBlue()),self.accountTitle,self.accountDetail, - DYLabel(@"有效会员,或已购买文章 14421 / 15792,即可浏览和下载全部已发布在线 LUT。\n在插件中点击“在线预览当前帧”会发送当前帧缩略图到 dayu.media;服务器仅在本次请求中处理,不保存预览帧。",12,NSFontWeightRegular,DYSecondary()), + DYLabel(@"有效会员,或已购买文章 14421 / 15792,即可浏览和下载全部已发布在线 LUT。\n打开插件的 LUT 浏览器时,会自动发送当前缓存帧缩略图到 dayu.media 并批量加载在线预览;服务器不保存预览帧。点击在线 LUT 后安装到本地分类,可离线使用。",12,NSFontWeightRegular,DYSecondary()), DYStack(@[self.loginButton,self.accessButton,self.logoutButton],NSUserInterfaceLayoutOrientationHorizontal,8)],NSUserInterfaceLayoutOrientationVertical,12)); NSArray *features = @[ @[@"slider.horizontal.3",@"完整调色",@"精准还原,自由塑造",@"CST 色彩管理、光影与曲线\nHSL、色轮、蜘蛛盘与白平衡",DYBlue()], @@ -291,7 +291,7 @@ typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYRe BOOL allowed=[value[@"allowed"]isKindOfClass:NSNumber.class]&&[value[@"allowed"]boolValue]; self.accountTitle.stringValue=allowed?@"在线 LUT 已开放":@"账号已登录,尚无在线 LUT 权限"; NSString *name=[value[@"username"]isKindOfClass:NSString.class]?value[@"username"]:@"大鱼用户"; - self.accountDetail.stringValue=[NSString stringWithFormat:@"%@\n%@",name,allowed?@"已识别本机绑定账号。在 FCP 的 LUT 浏览器切换“在线 LUT”即可使用。":@"需要有效会员,或购买文章 14421 / 15792。购买后点击刷新权限。"]; + self.accountDetail.stringValue=[NSString stringWithFormat:@"%@\n%@",name,allowed?@"已识别本机绑定账号。在 FCP 的 LUT 浏览器分类栏中展开“在线 LUT”即可使用。":@"需要有效会员,或购买文章 14421 / 15792。购买后点击刷新权限。"]; } - (void)restoreBoundOnlineAccount { NSUInteger generation=++self.accountGeneration;[self.accountTask cancel]; diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index fe2b243..e6cf230 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.22.0 + 1.22.1 CFBundleVersion - 131 + 132 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/开发交接.md b/开发交接.md index 72f6388..4bdcb65 100644 --- a/开发交接.md +++ b/开发交接.md @@ -2,24 +2,22 @@ 更新于 2026-11-11(Asia/Shanghai)。这是新对话的接手入口。历史设计和实现细节按需查阅专项交接,复现和交付证据以对应版本的报告为准。 -## 1.22.0(131)在线 LUT +## 正在修改:1.22.1(132)统一 LUT 浏览器 -已接入主 APP 硬件 UUID 账号识别、微信登录回退、在线分类/搜索/分页、校验下载及手动当前帧在线预览。有效会员,或购买文章 **14421 / 15792 任意一个**的账号,可浏览全部已发布在线 LUT;每次请求由服务端复核设备绑定与权益。本地调色保持离线可用。点击“预览当前帧”才上传最长边 640 的 PNG 缩略图到 dayu.media,服务器内存处理,不保存帧;移动播放头不会自动上传。 +用户要求:打开浏览器即上传当前缓存帧批量生成在线效果预览;在线与本地在同一分类树中显示,在线 LUT 有总分类及子分类;本地支持二级及更深目录;点击在线 LUT 安装到本地分类并应用。 -两个 MU 后端文件已按 NAS 生产基线流程部署。44 项后端合约、46 项原生在线浏览器合约、40 项本地浏览器回归、6 项线上未授权检查和既有更新接口检查通过。最终正式 APP 的签名、票据、Gatekeeper、1,028 项正式安装检查、17 套模板及 PluginKit 唯一路径通过。 +基线为已推送 `3524267800f76173614298a2d958babae3d20547`,正式安装仍为 1.22.0(131)。工程文件已有 Security 引用排序差异原样保留,不属于本轮改动。只改客户端和打包说明,不涉及后端部署。 -已从唯一正式路径启动 **1.22.0(131)**,APP 公证 `1e57ee70-d099-4942-91fd-29a2d5f47a44` Accepted;实际编译为独立远端检出的 `d979f8958caf36cc7b97ea838960c69f7fbb4d91`。主 APP 自动识别 macOS 硬件 UUID 绑定账号,退出保持退出,刷新恢复通过。FCP 12.4 独立合成色卡验证共享登录、1,233 个 LUT/17 分类、云端当前帧缩略图、下载应用、原图划像和 2:01→3:24 播放,宿主正常退出。主 APP 留在已登录可用状态。只上传合成色卡,未上传用户素材。真实接口另核对全部 21 页、搜索、分类与下载摘要。 +已实现:移除来源切换菜单、统一可展开分类树、自动捕获开窗缓存帧、后台预载当前在线页(并发 2)、独立在线预览缓存与取消状态、安装后立即刷新本地子分类。新帧不连续上传,保留“更新预览”操作。预览缩略图最长边 640、最多 230400 像素,服务器不保存帧。首次无缓存帧时在收到第一帧后自动补载。主 APP 和安装说明同步更新。 -现场发现 SQL 编号/大小以字符串输出导致空网格,已在后端修正,44 项 PHP 合约覆盖,并在正式 FCP 重新验收通过。新机未绑定时的微信 OAuth 首次扫码和 Motion 宿主未实测。130 的 APP/PKG 曾通过验证但未发行,现已被 131 取代。最终 PKG 已完成 Installer 签名、公证 `bfb54c49-b563-4420-9e9b-2319e1565420`、票据与 Gatekeeper 验证,20 项验包通过;大小 44557321 字节,SHA-256 `82bfe89889bd7e09ba68d85c0a52f36bb291de4cfe98c509fb6df8d40d9dd2dd`。Release **428** 已发布,附件 **69** 完整下载通过;标签 `v1.22.0-online-luts-20261111` 指向 `31d1089264e10469bececa7b27b3bcd06a7eb445`。独立远端恢复逐字节核对 911 个跟踪文件和 Git 完整性,APP 构建输入与实际编译提交一致。 +已通过 59 项模拟网络/真实本地导入检查;本地浏览器回归及正式构建验收继续进行。尚未安装、公证或发行 132。下一步:完成回归,保存源码检查点后正式构建、公证、唯一安装和 FCP 合成色卡验收,再制包与 Release 下载核验。验收只用合成图,不改用户时间线。 -[专项实现和生产映射](research/OnlineLUTIntegration-20261111.md) · [部署](verification/OnlineLUTDeployment.json) · [安装](verification/Delivery1.22.0.json) · [宿主范围](verification/HostOnlineLUT1.22.0.json) · [构建恢复](verification/OnlineLUTBuildRecovery.json)。127/128/129/130 为未发行候选,其诊断证据保留;最终 131 验证后已清理已知替换备份。工程文件既有的 Security 引用排序差异保留,不纳入本任务提交。站点文章和更新通道暂仍为 1.21.8(126),本轮没有改动它们。 - -[Release 及下载](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.0-online-luts-20261111) · [发行校验](verification/Release1.22.0.json) · [验包](verification/Package1.22.0.json) · [独立恢复](verification/Recovery1.22.0.json)。本轮合成验收库、恢复检出、参考检出、下载副本和旧版生成备份已清理;正式浏览器下载的一个有效 LUT 保留供离线使用。 +131 的完整交付记录见 [此前交接](research/OnlineLUTRelease131Handoff.md)、[发行](verification/Release1.22.0.json)、[恢复](verification/Recovery1.22.0.json)。站点文章与主 APP 更新通道仍为 1.21.8(126),本轮不变。 ## 接手与恢复 - 工程根:`/Volumes/备份/大鱼调色/大鱼调色`;主分支 `main`,远程 `https://dayu.media/git/dayu/dayu-color.git`。 - 正式编译和公证安装:`tools/deliver.py`;宿主验收后输入 `complete`。正式验收 APP 制包:`Packaging/build_pkg.py`,Release 发布:`Packaging/publish_release.py`。 - 后端:`Backend/` 为源码备份,本机专项工程 `/Users/mac/Downloads/dayumedia/dayu-color-beta`;NAS 仅生产部署,不在其上编译。生产相对路径与校验见专项记录及 `Backend/deploy_online_luts.py`。 -- 继续测试时先在主 APP 自动识别硬件绑定账号,未绑定时微信登录,再在插件切换“在线 LUT”;手动预览当前帧后核对真实目录、下载和云端图像,新机 OAuth 首次扫码仍需真实用户确认,不能用硬件恢复验收代替。 +- 继续测试时先在主 APP 自动识别硬件绑定账号,未绑定时微信登录,再在统一分类栏选择“在线 LUT”;打开时自动预载当前缓存帧,核对真实目录、分类安装和云端图像,新机 OAuth 首次扫码仍需真实用户确认,不能用硬件恢复验收代替。 - [恢复说明](RECOVERY.md) · [此前版本交接归档](research/HandoffHistory-20261111-before-online-release.md)。凭据、私钥和账号令牌留在钥匙串,不进入仓库。