godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #67158 from amoriqbal/fix_error_message 

Fix the conditions for firing 'No such file or directory' error on Linux `move_to_trash`
This commit is contained in:
Rémi Verschelde 2023-06-19 10:26:50 +02:00
parent 116f783db7 43264bff23
commit 01e84b1da1
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
platform/linuxbsd/os_linuxbsd.cpp
View File

@ -961,32 +961,41 @@ Error OS_LinuxBSD::move_to_trash(const String &p_path) {
args.push_back(path);
args.push_front("trash"); // The command is `gio trash <file_name>` so we need to add it to args.
Error result = execute("gio", args, nullptr, &err_code); // For GNOME based machines.
if (result == OK && !err_code) {
return OK;
} else if (err_code == 2) {
return ERR_FILE_NOT_FOUND;
if (result == OK) { // The `execute` function has done its job without errors.
if (!err_code) { // The shell command has been executed without errors.
return OK;
} else if (err_code == 1) {
ERR_PRINT("move_to_trash: No such file or directory as " + path + ".");
return ERR_FILE_NOT_FOUND;
}
}
args.pop_front();
args.push_front("move");
args.push_back("trash:/"); // The command is `kioclient5 move <file_name> trash:/`.
result = execute("kioclient5", args, nullptr, &err_code); // For KDE based machines.
if (result == OK && !err_code) {
return OK;
} else if (err_code == 2) {
return ERR_FILE_NOT_FOUND;
if (result == OK) { // The `execute` function has done its job without errors.
if (!err_code) { // The shell command has been executed without errors.
return OK;
} else if (err_code == 1) {
ERR_PRINT("move_to_trash: No such file or directory as " + path + ".");
return ERR_FILE_NOT_FOUND;
}
}
args.pop_front();
args.pop_back();
result = execute("gvfs-trash", args, nullptr, &err_code); // For older Linux machines.
if (result == OK && !err_code) {
return OK;
} else if (err_code == 2) {
return ERR_FILE_NOT_FOUND;
if (result == OK) { // The `execute` function has done its job without errors.
if (!err_code) { // The shell command has been executed without errors.
return OK;
} else if (err_code == 1) {
ERR_PRINT("move_to_trash: No such file or directory as " + path + ".");
return ERR_FILE_NOT_FOUND;
}
}
// If the commands `kioclient5`, `gio` or `gvfs-trash` don't exist on the system we do it manually.
// If the commands `kioclient5`, `gio` or `gvfs-trash` don't work on the system we do it manually.
String trash_path = "";
String mnt = get_mountpoint(path);