mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

mac: Use NSFileManager::resultingItemURL for moving file to trash

Browse source 
This allows the deleted file to be restored, fixes #2001.
This commit is contained in:
Cheng Zhao 2015-06-18 13:09:02 +08:00
parent beb2853bbf
commit c8eaaaea83
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
atom/common/platform_util_mac.mm
View file

@ -140,17 +140,12 @@ bool OpenExternal(const GURL& url) {
}
bool MoveItemToTrash(const base::FilePath& full_path) {
DCHECK([NSThread isMainThread]);
NSString* path_string = base::SysUTF8ToNSString(full_path.value());
NSArray* file_array =
[NSArray arrayWithObject:[path_string lastPathComponent]];
BOOL status = [[NSWorkspace sharedWorkspace]
performFileOperation:NSWorkspaceRecycleOperation
source:[path_string stringByDeletingLastPathComponent]
destination:@""
files:file_array
tag:nil];
if (!path_string || !file_array || !status)
BOOL status = [[NSFileManager defaultManager]
trashItemAtURL:[NSURL fileURLWithPath:path_string]
resultingItemURL:nil
error:nil];
if (!path_string || !status)
LOG(WARNING) << "NSWorkspace failed to move file " << full_path.value()
<< " to trash";
return status;