修复后台在线失败影响本地按钮并保存133候选
这个提交包含在:
1 父节点
c7f6311506
当前提交
7f833757da
9 个文件已更改
+63
-9
没有与搜索条件相匹配的文件
@@ -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)));
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.22.1</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>132</string>
|
||||
<string>133</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.22.1</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>132</string>
|
||||
<string>133</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
在新工单中引用
屏蔽一个用户