统一LUT分类树并在开窗时自动批量预载缓存帧效果

这个提交包含在:
mac 于 2026-11-11 20:57:52 +08:00 提交
1 父节点 3524267800
当前提交 da700d4e2f
10 个文件已更改
+427 -88

没有与搜索条件相匹配的文件

+117 -62
查看文件
@@ -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<end;i++){
NSString *path=_folderPaths[i];DYBrowserFolderButton *button=existing[path];
if(!button){button=[[[DYBrowserFolderButton alloc]initWithFrame:NSZeroRect]autorelease];button.bordered=NO;button.target=self;button.action=@selector(folderClicked:);button.identifier=path;
button.title=[path isEqual:DYBrowserRecentFolder]?@"最近使用":[path isEqualToString:@"*"]?@"全部 LUT":path.length?[@"▸ " stringByAppendingString:path]:@"未分类";button.toolTip=path.length?path:_library.rootURL.path;button.palette=_palette;button.accessibilityLabel=[@"LUT 文件夹:" stringByAppendingString:button.title];[_folderDocument addSubview:button];}
if(!button){button=[[[DYBrowserFolderButton alloc]initWithFrame:NSZeroRect]autorelease];button.bordered=NO;button.target=self;button.action=@selector(folderClicked:);button.identifier=path;button.palette=_palette;[_folderDocument addSubview:button];}
BOOL online=DYBrowserIsOnlineFolder(path),onlineRoot=[path isEqual:DYBrowserOnlineFolder];
button.title=onlineRoot?@"在线 LUT":online?[path substringFromIndex:DYBrowserOnlineCategoryPrefix.length]:[path isEqual:DYBrowserRecentFolder]?@"最近使用":[path isEqual:@"*"]?@"全部本地 LUT":[path isEqual:@"在线 LUT"]?@"已安装 LUT":path.length?path.lastPathComponent:@"未分类";
button.depth=online?(onlineRoot?0:1):path.length?MAX(0,(NSInteger)path.pathComponents.count-1):0;
button.branch=onlineRoot;
if(!online&&path.length)for(NSString *folder in _library.folders)if([folder hasPrefix:[path stringByAppendingString:@"/"]]){button.branch=YES;break;}
button.expanded=![_collapsedFolders containsObject:path];button.toolTip=online?button.title:path.length?path:_library.rootURL.path;
button.accessibilityLabel=[@"LUT 分类:" stringByAppendingString:button.title];button.accessibilityHelp=button.branch?@"点击箭头展开或折叠,点击名称选择此分类;左右方向键展开或折叠。":button.toolTip;
button.chosen=[path isEqualToString:_folder];button.frame=NSMakeRect(4,4+i*35,MAX(92,_folderScroll.contentSize.width-8),33);[button setNeedsDisplay:YES];[buttons addObject:button];
}
for(NSButton *button in _folderButtons)if(![buttons containsObject:button])[button removeFromSuperview];[_folderButtons setArray:buttons];
@@ -734,7 +764,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
_importFiles.enabled=YES;_importFolder.enabled=YES;_refresh.title=@"刷新";_done.title=_embedded?@"返回调整":@"完成";_done.toolTip=nil;
}
- (void)reloadLibrary:(id)sender{
if(_onlineMode){[self loadOnlineCatalog];return;}
if(_onlineMode&&_onlineStarted&&sender){[self captureOnlineFrame];[self loadOnlineCatalog];return;}
if(_libraryTask){[_libraryTask cancel];[self setStatus:@"正在取消…"];return;}
[self invalidatePreviewImages];NSUInteger generation=++_libraryGeneration;
NSProgress *task=[_library reloadAsync:^(NSError *error){
@@ -743,11 +773,19 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
}];[self beginLibraryTask:task];
}
- (void)folderClicked:(NSButton *)sender{
if(!sender.identifier)return;
if([sender isKindOfClass:DYBrowserFolderButton.class]&&[(DYBrowserFolderButton *)sender disclosureClicked]){
if([_collapsedFolders containsObject:sender.identifier])[_collapsedFolders removeObject:sender.identifier];else [_collapsedFolders addObject:sender.identifier];
[self rebuildFolders];[self layoutBrowser];return;
}
BOOL online=DYBrowserIsOnlineFolder(sender.identifier),changed=online!=_onlineMode;
if(changed){++_selectionGeneration;[_selectionTask cancel];[_selectionTask release];_selectionTask=nil;}
[_folder release];_folder=[sender.identifier copy];
if(_onlineMode){_onlinePage=1;[self loadOnlineCatalog];return;}
_onlineMode=online;[self updateSourceControls];
if(changed){_search.stringValue=@"";[_comparisonOriginal release];_comparisonOriginal=nil;[self resetThumbnailWork];}
[[NSUserDefaults standardUserDefaults]setObject:_folder forKey:DYBrowserPreference(DYBrowserFolderPreference,_library)];
for(DYBrowserFolderButton *button in _folderButtons){button.chosen=[button.identifier isEqualToString:_folder];[button setNeedsDisplay:YES];}
[self rebuildGrid];
if(online){_onlinePage=1;[self loadOnlineCatalog];}else{[self rebuildGrid];[self setStatus:@"单击缩略图应用 LUT"];}
}
- (void)searchChanged:(id)sender{if(_onlineMode){[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(debouncedOnlineSearch) object:nil];[self performSelector:@selector(debouncedOnlineSearch) withObject:nil afterDelay:.35];}else [self rebuildGrid];}
- (void)controlTextDidChange:(NSNotification *)notification{if(notification.object==_search)[self searchChanged:_search];}
@@ -774,7 +812,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
BOOL recent=[_folder isEqual:DYBrowserRecentFolder];NSArray *history=_recentSnapshot;
for(NSDictionary *entry in (_onlineMode?(_onlineEntries?:@[]):recent?[_library recentEntriesForPaths:history]:_library.entries)){
NSString *folder=entry[@"relativeFolder"]?:@"";
BOOL folderMatch=recent||[_folder isEqualToString:@"*"]||[folder isEqualToString:_folder]||(_folder.length&&[folder hasPrefix:[_folder stringByAppendingString:@"/"]]);
BOOL folderMatch=_onlineMode||recent||[_folder isEqualToString:@"*"]||[folder isEqualToString:_folder]||(_folder.length&&[folder hasPrefix:[_folder stringByAppendingString:@"/"]]);
if(folderMatch&&(!query.length||[entry[@"name"]localizedCaseInsensitiveContainsString:query]||[entry[@"relativePath"]localizedCaseInsensitiveContainsString:query]))[entries addObject:entry];
}
if(!recent&&!_onlineMode)[entries sortUsingComparator:^NSComparisonResult(NSDictionary *a,NSDictionary *b){NSUInteger i=[history indexOfObject:a[@"path"]],j=[history indexOfObject:b[@"path"]];if(i==j)return [a[@"relativePath"]localizedStandardCompare:b[@"relativePath"]];return i<j?NSOrderedAscending:NSOrderedDescending;}];
@@ -841,22 +879,24 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
if(![[NSFileManager defaultManager]createDirectoryAtURL:_library.rootURL withIntermediateDirectories:YES attributes:nil error:&error]){[self showImportError:error];return;}
if(![[NSWorkspace sharedWorkspace]openURL:_library.rootURL])[self setStatus:@"无法打开 LUT 文件夹"];
}
- (void)sourceChanged:(id)sender {
BOOL online=_sourceMenu.indexOfSelectedItem==1;if(online==_onlineMode||_compactRecent)return;
[self cancelOnlineWork];
++_selectionGeneration;[_selectionTask cancel];[_selectionTask release];_selectionTask=nil;
if(online){[_localFolder release];_localFolder=[_folder copy];[_folder release];_folder=[@"*" copy];_onlinePage=1;}
else {[_folder release];_folder=[(_localFolder?:@"*")copy];}
_onlineMode=online;_importFiles.title=online?@"预览当前帧":@"导入文件…";_importFolder.title=online?@"登录 / 权限":@"导入文件夹…";_reveal.title=online?@"下一页":@"打开 LUT 文件夹";
_importFiles.accessibilityLabel=online?@"在线预览当前帧":@"导入 LUT 文件";_importFolder.accessibilityLabel=online?@"主 APP 登录与在线 LUT 权限":@"导入 LUT 文件夹";
_reveal.enabled=YES;
_search.stringValue=@"";[self invalidatePreviewImages];[self rebuildFolders];[self rebuildGrid];
if(online)[self loadOnlineCatalog];else [self setStatus:@"单击缩略图应用 LUT"];
- (void)updateSourceControls {
_importFiles.title=_onlineMode?@"更新预览":@"导入文件…";_importFolder.title=_onlineMode?@"登录 / 权限":@"导入文件夹…";_reveal.title=_onlineMode?@"下一页":@"打开文件夹";
_importFiles.accessibilityLabel=_onlineMode?@"更新在线预览缓存帧":@"导入 LUT 文件";_importFolder.accessibilityLabel=_onlineMode?@"主 APP 登录与在线 LUT 权限":@"导入 LUT 文件夹";
_reveal.enabled=!_onlineMode||_onlinePage*60<_onlineTotal;
}
- (void)resetOnlinePreviewWork {
_onlineWork.cancelled=YES;_onlineWork.owner=nil;[_onlineWork release];_onlineWork=[DYBrowserWork new];_onlineWork.owner=self;
for(NSProgress *task in _onlineTransfers)[task cancel];[_onlineTransfers removeAllObjects];[_onlineQueuedPaths removeAllObjects];
}
- (void)startOnlinePreviews {
if(_onlineStarted||_closed||_compactRecent||!self.visible)return;
_onlineStarted=YES;[self captureOnlineFrame];[self loadOnlineCatalog];
}
- (void)cancelOnlineWork {
++_onlineCatalogGeneration;[_onlineCatalogTask cancel];[_onlineCatalogTask release];_onlineCatalogTask=nil;
for(NSProgress *task in _onlineTransfers)[task cancel];[_onlineTransfers removeAllObjects];
[_onlinePNG release];_onlinePNG=nil;[_onlineFrame release];_onlineFrame=nil;
[self resetOnlinePreviewWork];_onlineWork.cancelled=YES;_onlineWork.owner=nil;
++_onlineFrameGeneration;_onlineFramePreparing=NO;
[_onlinePNG release];_onlinePNG=nil;[_onlineFrame release];_onlineFrame=nil;[_onlineThumbnailCache removeAllObjects];
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(debouncedOnlineSearch) object:nil];
}
- (void)onlineIdentityChanged:(NSNotification *)notification {
@@ -865,22 +905,23 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
[self->_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<self->_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];
+2 -2
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.22.0</string>
<string>1.22.1</string>
<key>CFBundleVersion</key>
<string>131</string>
<string>132</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>PlugInKit</key>