From c7f6311506d408abb9efb6246584212826864975 Mon Sep 17 00:00:00 2001 From: mac Date: Wed, 11 Nov 2026 20:59:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E8=87=AA=E5=8A=A8=E9=A2=84?= =?UTF-8?q?=E8=BD=BD=E8=BE=B9=E7=95=8C=E3=80=81=E7=AB=96=E5=B1=8F=E5=92=8C?= =?UTF-8?q?=E5=B1=82=E7=BA=A7=E5=88=86=E7=B1=BB=EF=BC=8C=E5=86=BB=E7=BB=93?= =?UTF-8?q?132=E6=BA=90=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/verify_online_luts.mm | 13 ++ .../LocalLUTBrowserRegression1.22.1.json | 166 ++++++++++++++++++ verification/UnifiedLUTBrowser1.22.1.json | 30 +++- 大鱼调色/Plugin/DYLUTBrowser.mm | 6 +- 开发交接.md | 2 +- 5 files changed, 212 insertions(+), 5 deletions(-) create mode 100644 verification/LocalLUTBrowserRegression1.22.1.json diff --git a/tools/verify_online_luts.mm b/tools/verify_online_luts.mm index cb2232e..0940fa1 100644 --- a/tools/verify_online_luts.mm +++ b/tools/verify_online_luts.mm @@ -121,6 +121,19 @@ int main(int argc,const char **argv){@autoreleasepool{ 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"); + paid=YES;NSUInteger beforeEmpty=count(@"/preview"); + DYLUTBrowser *empty=[[DYLUTBrowser alloc]initWithLibrary:library preview:nil selectedPath:nil palette:@{} selection:nil]; + [empty showInRemoteParent:parent close:nil];pump(^{return [empty valueForKey:@"onlineCatalogTask"]==nil&&[empty valueForKey:@"libraryTask"]==nil;}); + require(count(@"/preview")==beforeEmpty,@"opening without a cached frame waits without uploading fallback imagery"); + NSMutableData *portrait=[NSMutableData dataWithLength:360*1280*16];float *portraitSamples=(float *)portrait.mutableBytes;for(NSUInteger i=0;i<360*1280;i++)portraitSamples[i*4+3]=1; + [empty updatePreview:@{@"standard":portrait,@"standardSize":[NSValue valueWithSize:NSMakeSize(360,1280)],@"time":@3}]; + pump(^{return count(@"/preview")==beforeEmpty+10&&[[empty valueForKey:@"onlineTransfers"]count]==0;}); + require(count(@"/preview")==beforeEmpty+10,@"first arriving cache frame automatically fills previously empty online previews"); + NSDictionary *lastUpload=nil;for(NSDictionary *r in requests)if([r[@"path"]hasSuffix:@"/preview"])lastUpload=r; + NSBitmapImageRep *tall=[NSBitmapImageRep imageRepWithData:[[[NSData alloc]initWithBase64EncodedString:lastUpload[@"body"][@"frame_png"]options:0]autorelease]]; + require(tall.pixelsHigh==640&&tall.pixelsWide==180,@"portrait uploads honor longest-edge cap and preserve aspect");[empty close];[empty release]; + NSUInteger compactRequests=requests.count;DYLUTBrowser *compact=[[DYLUTBrowser alloc]initWithLibrary:library preview:frame selectedPath:nil palette:@{} selection:nil];[compact embedRecentInView:parent]; + pump(^{return [compact valueForKey:@"libraryTask"]==nil;});require(requests.count==compactRequests,@"compact recent shortcuts do not start cloud uploads");[compact close];[compact release]; [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]; diff --git a/verification/LocalLUTBrowserRegression1.22.1.json b/verification/LocalLUTBrowserRegression1.22.1.json new file mode 100644 index 0000000..b910125 --- /dev/null +++ b/verification/LocalLUTBrowserRegression1.22.1.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/UnifiedLUTBrowser1.22.1.json b/verification/UnifiedLUTBrowser1.22.1.json index ff1e100..700396b 100644 --- a/verification/UnifiedLUTBrowser1.22.1.json +++ b/verification/UnifiedLUTBrowser1.22.1.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" : 59, + "count" : 66, "pass" : true, "checks" : [ { @@ -238,6 +238,34 @@ { "name" : "closing stops all preview work without scheduling more uploads", "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "opening without a cached frame waits without uploading fallback imagery", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "first arriving cache frame automatically fills previously empty online previews", + "pass" : true + }, + { + "name" : "portrait uploads honor longest-edge cap and preserve aspect", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, + { + "name" : "compact recent shortcuts do not start cloud uploads", + "pass" : true } ] } \ No newline at end of file diff --git a/大鱼调色/Plugin/DYLUTBrowser.mm b/大鱼调色/Plugin/DYLUTBrowser.mm index 68019c6..23533cf 100644 --- a/大鱼调色/Plugin/DYLUTBrowser.mm +++ b/大鱼调色/Plugin/DYLUTBrowser.mm @@ -111,7 +111,7 @@ static NSRect DYBrowserTileImageRect(NSRect bounds,BOOL list) { - (void)dealloc{[_thumbnail release];[_displayName release];[_failure release];[_palette release];[super dealloc];} - (NSString *)accessibilityLabel{return _displayName?:@"LUT";} - (id)accessibilityValue{return _chosen?@"已选择":_failure.length?@"LUT 无效":_thumbnail?@"可应用":@"正在生成缩略图";} -- (NSString *)accessibilityHelp{return _failure?:_shortcut?@"点击将此 LUT 应用到当前风格图层":@"单击应用此 LUT,双击应用并关闭浏览器";} +- (NSString *)accessibilityHelp{return _failure?:_online?@"单击安装到本地分类并应用,双击应用并关闭浏览器":_shortcut?@"点击将此 LUT 应用到当前风格图层":@"单击应用此 LUT,双击应用并关闭浏览器";} - (void)drawRect:(NSRect)dirty{ NSRect bounds=NSInsetRect(self.bounds,1,1); NSBezierPath *outline=[NSBezierPath bezierPathWithRoundedRect:bounds xRadius:7 yRadius:7]; @@ -720,13 +720,13 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b - (void)setStatus:(NSString *)status{_statusLabel.stringValue=status?:@"";_statusLabel.toolTip=status;} - (void)rebuildFolders{ NSMutableArray *paths=[NSMutableArray arrayWithObjects:DYBrowserRecentFolder,@"*",nil];NSMutableSet *seen=[NSMutableSet setWithArray:paths]; + [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];} 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]; } diff --git a/开发交接.md b/开发交接.md index 4bdcb65..6c2c7eb 100644 --- a/开发交接.md +++ b/开发交接.md @@ -10,7 +10,7 @@ 已实现:移除来源切换菜单、统一可展开分类树、自动捕获开窗缓存帧、后台预载当前在线页(并发 2)、独立在线预览缓存与取消状态、安装后立即刷新本地子分类。新帧不连续上传,保留“更新预览”操作。预览缩略图最长边 640、最多 230400 像素,服务器不保存帧。首次无缓存帧时在收到第一帧后自动补载。主 APP 和安装说明同步更新。 -已通过 59 项模拟网络/真实本地导入检查;本地浏览器回归及正式构建验收继续进行。尚未安装、公证或发行 132。下一步:完成回归,保存源码检查点后正式构建、公证、唯一安装和 FCP 合成色卡验收,再制包与 Release 下载核验。验收只用合成图,不改用户时间线。 +已通过 66 项模拟网络/真实本地导入检查与 40 项本地浏览器回归,覆盖空缓存首次补载、竖屏 640 上限、关窗取消、二级分类折叠及离线可用。正式构建验收继续进行。尚未安装、公证或发行 132。下一步:完成回归,保存源码检查点后正式构建、公证、唯一安装和 FCP 合成色卡验收,再制包与 Release 下载核验。验收只用合成图,不改用户时间线。 131 的完整交付记录见 [此前交接](research/OnlineLUTRelease131Handoff.md)、[发行](verification/Release1.22.0.json)、[恢复](verification/Recovery1.22.0.json)。站点文章与主 APP 更新通道仍为 1.21.8(126),本轮不变。