diff --git a/tools/verify_online_luts.mm b/tools/verify_online_luts.mm index 0940fa1..cb9e33a 100644 --- a/tools/verify_online_luts.mm +++ b/tools/verify_online_luts.mm @@ -121,10 +121,12 @@ 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"); + paid=NO;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"); + require([[empty valueForKey:@"reveal"]isEnabled],@"background online permission failure never disables local folder access"); + paid=YES;[empty performSelector:@selector(loadOnlineCatalog)];pump(^{return [empty valueForKey:@"onlineCatalogTask"]==nil;}); 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;}); diff --git a/verification/SupersededUnifiedLUTBuild132.json b/verification/SupersededUnifiedLUTBuild132.json new file mode 100644 index 0000000..422c07f --- /dev/null +++ b/verification/SupersededUnifiedLUTBuild132.json @@ -0,0 +1,13 @@ +{ + "version": "1.22.1", + "build": 132, + "sourceCommit": "c7f6311506d408abb9efb6246584212826864975", + "preflightChecks": 1028, + "preflightPassed": true, + "notaryID": "a0ed9a93-a639-45c7-9c97-55d982b66033", + "notaryStatus": "In Progress", + "installed": false, + "published": false, + "reason": "Superseded before install: protect local folder controls when background online catalog fails, encode cached PNG independently of local LUT parsing queue.", + "submittedZIP_SHA256": "58be5dd2a37c97b44212d4935b7ba2187ee4abe013488ea911055e99e24c9de3" +} diff --git a/verification/UnifiedLUTBrowser1.22.1.json b/verification/UnifiedLUTBrowser1.22.1.json index 700396b..4144b62 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" : 66, + "count" : 68, "pass" : true, "checks" : [ { @@ -247,6 +247,14 @@ "name" : "opening without a cached frame waits without uploading fallback imagery", "pass" : true }, + { + "name" : "background online permission failure never disables local folder access", + "pass" : true + }, + { + "name" : "asynchronous operation finished", + "pass" : true + }, { "name" : "asynchronous operation finished", "pass" : true diff --git a/verification/UnifiedLUTBuildSource132.json b/verification/UnifiedLUTBuildSource132.json new file mode 100644 index 0000000..4fc0eb3 --- /dev/null +++ b/verification/UnifiedLUTBuildSource132.json @@ -0,0 +1,9 @@ +{ + "pass": true, + "sourceCommit": "c7f6311506d408abb9efb6246584212826864975", + "remote": "https://dayu.media/git/dayu/dayu-color.git", + "independentHTTPSClone": true, + "trackedFilesByteMatched": 918, + "sourceCleanBeforeBuild": true, + "scope": "Remote clone used for formal build; main workspace pre-existing project ordering diff is excluded." +} diff --git a/verification/UnifiedLUTFCPXMLFixture133.json b/verification/UnifiedLUTFCPXMLFixture133.json new file mode 100644 index 0000000..3df01ea --- /dev/null +++ b/verification/UnifiedLUTFCPXMLFixture133.json @@ -0,0 +1,22 @@ +{ + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/lut-unified-133/大鱼调色_统一LUT验收133.fcpxml", + "status": "pass", + "dtd": "/Applications/Final Cut Pro.app/Contents/Frameworks/Interchange.framework/Versions/A/Resources/FCPXMLv1_12.dtd", + "errors": [], + "warnings": [], + "checks": { + "dtd": true, + "xml": true, + "local_media": { + "checked": 1, + "missing": 0 + } + }, + "version": "1.12", + "summary": { + "projects": 1, + "assets": 1, + "elements": 15 + }, + "host_validation": "not_performed_by_this_command" +} diff --git a/大鱼调色/Plugin/DYLUTBrowser.mm b/大鱼调色/Plugin/DYLUTBrowser.mm index 23533cf..5d6663b 100644 --- a/大鱼调色/Plugin/DYLUTBrowser.mm +++ b/大鱼调色/Plugin/DYLUTBrowser.mm @@ -913,7 +913,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b - (void)loadOnlineCatalog { if(!_onlineStarted||_closed)return; NSUInteger generation=++_onlineCatalogGeneration;[_onlineCatalogTask cancel];[_onlineCatalogTask release];_onlineCatalogTask=nil; - [self setStatus:@"正在加载在线 LUT…"];_previousPage.enabled=NO;_reveal.enabled=NO; + if(_onlineMode){[self setStatus:@"正在加载在线 LUT…"];_previousPage.enabled=NO;_reveal.enabled=NO;} 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){ @@ -921,7 +921,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b [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;if(self->_onlineMode){[self rebuildGrid];[self setStatus:error.localizedDescription?:@"在线目录格式无效。"];self->_emptyLabel.stringValue=error.localizedDescription?:@"请刷新在线目录。";}return; + [self->_onlineEntries release];self->_onlineEntries=nil;[self updateSourceControls];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]; @@ -950,7 +950,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b [_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{ + dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED,0),^{@autoreleasepool{ 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))); diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 35bc965..755cf92 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.22.1 CFBundleVersion - 132 + 133 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index e6cf230..2d5bc19 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.22.1 CFBundleVersion - 132 + 133 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/开发交接.md b/开发交接.md index 6c2c7eb..8229c49 100644 --- a/开发交接.md +++ b/开发交接.md @@ -2,7 +2,7 @@ 更新于 2026-11-11(Asia/Shanghai)。这是新对话的接手入口。历史设计和实现细节按需查阅专项交接,复现和交付证据以对应版本的报告为准。 -## 正在修改:1.22.1(132)统一 LUT 浏览器 +## 正在修改:1.22.1(133)统一 LUT 浏览器 用户要求:打开浏览器即上传当前缓存帧批量生成在线效果预览;在线与本地在同一分类树中显示,在线 LUT 有总分类及子分类;本地支持二级及更深目录;点击在线 LUT 安装到本地分类并应用。 @@ -10,7 +10,7 @@ 已实现:移除来源切换菜单、统一可展开分类树、自动捕获开窗缓存帧、后台预载当前在线页(并发 2)、独立在线预览缓存与取消状态、安装后立即刷新本地子分类。新帧不连续上传,保留“更新预览”操作。预览缩略图最长边 640、最多 230400 像素,服务器不保存帧。首次无缓存帧时在收到第一帧后自动补载。主 APP 和安装说明同步更新。 -已通过 66 项模拟网络/真实本地导入检查与 40 项本地浏览器回归,覆盖空缓存首次补载、竖屏 640 上限、关窗取消、二级分类折叠及离线可用。正式构建验收继续进行。尚未安装、公证或发行 132。下一步:完成回归,保存源码检查点后正式构建、公证、唯一安装和 FCP 合成色卡验收,再制包与 Release 下载核验。验收只用合成图,不改用户时间线。 +已通过 68 项模拟网络/真实本地导入检查与 40 项本地浏览器回归,覆盖空缓存首次补载、竖屏 640 上限、关窗取消、二级分类折叠及离线可用。正式构建验收继续进行。132 在公证等待期间发现离线按钮边界问题,已停止安装;正式旧版仍为 131。133 补齐后台错误不影响本地按钮、缓存帧编码不等待本地 LUT 解析队列。尚未安装、公证或发行 133。下一步:完成回归,保存源码检查点后正式构建、公证、唯一安装和 FCP 合成色卡验收,再制包与 Release 下载核验。验收只用合成图,不改用户时间线。 131 的完整交付记录见 [此前交接](research/OnlineLUTRelease131Handoff.md)、[发行](verification/Release1.22.0.json)、[恢复](verification/Recovery1.22.0.json)。站点文章与主 APP 更新通道仍为 1.21.8(126),本轮不变。