godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #88126 from bruvzg/mac_open_shell 

[macOS] Allow `open_shell` to handle filenames without `file://`.
This commit is contained in:
Rémi Verschelde 2024-02-09 12:36:40 +01:00
parent 4966b22fc5 cc313a1c1c
commit d351299455
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/macos/os_macos.mm
View File

@ -356,8 +356,11 @@ Error OS_MacOS::shell_show_in_file_manager(String p_path, bool p_open_folder) {
Error OS_MacOS::shell_open(String p_uri) { Error OS_MacOS::shell_open(String p_uri) {
NSString *string = [NSString stringWithUTF8String:p_uri.utf8().get_data()]; NSString *string = [NSString stringWithUTF8String:p_uri.utf8().get_data()];
NSURL *uri = [[NSURL alloc] initWithString:string]; NSURL *uri = [[NSURL alloc] initWithString:string];
// Escape special characters in filenames
if (!uri || !uri.scheme || [uri.scheme isEqual:@"file"]) { if (!uri || !uri.scheme || [uri.scheme isEqual:@"file"]) {
// No scheme set, assume "file://" and escape special characters.
if (!p_uri.begins_with("file://")) {
string = [NSString stringWithUTF8String:("file://" + p_uri).utf8().get_data()];
}
uri = [[NSURL alloc] initWithString:[string stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]]]; uri = [[NSURL alloc] initWithString:[string stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]]];
} }
[[NSWorkspace sharedWorkspace] openURL:uri]; [[NSWorkspace sharedWorkspace] openURL:uri];