highperfocused/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2025-11-10 17:28:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

app: fix macOS file picker to support Uniform Type Identifiers (#12965)

Browse Source
This commit is contained in:
Vincent Koc
2025-11-05 21:37:17 -08:00
committed by GitHub
parent 80d34260ea
commit 4111db013f
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/dialog/cocoa/dlg.m
View File

@@ -3,6 +3,11 @@
#include <string.h> #include <string.h>
#include <sys/syslimits.h> #include <sys/syslimits.h>
// Import UniformTypeIdentifiers for macOS 11+
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 110000
#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
#endif
void* NSStr(void* buf, int len) { void* NSStr(void* buf, int len) {
return (void*)[[NSString alloc] initWithBytes:buf length:len encoding:NSUTF8StringEncoding]; return (void*)[[NSString alloc] initWithBytes:buf length:len encoding:NSUTF8StringEncoding];
} }
@@ -109,12 +114,20 @@ DlgResult fileDlg(FileDlgParams* params) {
if(self->params->title != nil) { if(self->params->title != nil) {
[panel setTitle:[[NSString alloc] initWithUTF8String:self->params->title]]; [panel setTitle:[[NSString alloc] initWithUTF8String:self->params->title]];
} }
#pragma clang diagnostic push // Use modern allowedContentTypes API for better file type support (especially video files)
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if(self->params->numext > 0) { if(self->params->numext > 0) {
[panel setAllowedFileTypes:[NSArray arrayWithObjects:(NSString**)self->params->exts count:self->params->numext]]; NSMutableArray *utTypes = [NSMutableArray arrayWithCapacity:self->params->numext];
NSString** exts = (NSString**)self->params->exts;
for(int i = 0; i < self->params->numext; i++) {
UTType *type = [UTType typeWithFilenameExtension:exts[i]];
if(type) {
[utTypes addObject:type];
}
}
if([utTypes count] > 0) {
[panel setAllowedContentTypes:utTypes];
}
} }
#pragma clang diagnostic pop
if(self->params->relaxext) { if(self->params->relaxext) {
[panel setAllowsOtherFileTypes:YES]; [panel setAllowsOtherFileTypes:YES];
} }

2
app/dialog/cocoa/dlg_darwin.go
View File

@@ -1,6 +1,6 @@
package cocoa package cocoa
// #cgo darwin LDFLAGS: -framework Cocoa // #cgo darwin LDFLAGS: -framework Cocoa -framework UniformTypeIdentifiers
// #include <stdlib.h> // #include <stdlib.h>
// #include <sys/syslimits.h> // #include <sys/syslimits.h>
// #include "dlg.h" // #include "dlg.h"