fix: make shell.moveItemToTrash return false on Windows when move unsuccessful (#25124)
This commit is contained in:
parent
443540fd13
commit
bab69ae4d2
2 changed files with 40 additions and 1 deletions
|
@ -387,10 +387,14 @@ bool MoveItemToTrash(const base::FilePath& path, bool delete_on_fail) {
|
||||||
if (!delete_sink)
|
if (!delete_sink)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
BOOL pfAnyOperationsAborted;
|
||||||
|
|
||||||
// Processes the queued command DeleteItem. This will trigger
|
// Processes the queued command DeleteItem. This will trigger
|
||||||
// the DeleteFileProgressSink to check for Recycle Bin.
|
// the DeleteFileProgressSink to check for Recycle Bin.
|
||||||
return SUCCEEDED(pfo->DeleteItem(delete_item.Get(), delete_sink.Get())) &&
|
return SUCCEEDED(pfo->DeleteItem(delete_item.Get(), delete_sink.Get())) &&
|
||||||
SUCCEEDED(pfo->PerformOperations());
|
SUCCEEDED(pfo->PerformOperations()) &&
|
||||||
|
SUCCEEDED(pfo->GetAnyOperationsAborted(&pfAnyOperationsAborted)) &&
|
||||||
|
!pfAnyOperationsAborted;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GetFolderPath(int key, base::FilePath* result) {
|
bool GetFolderPath(int key, base::FilePath* result) {
|
||||||
|
|
|
@ -7,6 +7,8 @@ import * as fs from 'fs-extra';
|
||||||
import * as path from 'path';
|
import * as path from 'path';
|
||||||
import { AddressInfo } from 'net';
|
import { AddressInfo } from 'net';
|
||||||
import { expect } from 'chai';
|
import { expect } from 'chai';
|
||||||
|
import { ifit } from './spec-helpers';
|
||||||
|
import { execSync } from 'child_process';
|
||||||
|
|
||||||
describe('shell module', () => {
|
describe('shell module', () => {
|
||||||
describe('shell.openExternal()', () => {
|
describe('shell.openExternal()', () => {
|
||||||
|
@ -76,5 +78,38 @@ describe('shell module', () => {
|
||||||
const result = shell.moveItemToTrash(filename);
|
const result = shell.moveItemToTrash(filename);
|
||||||
expect(result).to.be.false();
|
expect(result).to.be.false();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
ifit(process.platform === 'darwin')('returns false when file has immutable flag', async () => {
|
||||||
|
const dir = await fs.mkdtemp(path.resolve(app.getPath('temp'), 'electron-shell-spec-'));
|
||||||
|
const tempPath = path.join(dir, 'locked-file');
|
||||||
|
await fs.writeFile(tempPath, 'delete me if you can');
|
||||||
|
|
||||||
|
// https://ss64.com/osx/chflags.html
|
||||||
|
execSync(`chflags uchg ${tempPath}`);
|
||||||
|
expect(shell.moveItemToTrash(tempPath)).to.be.false();
|
||||||
|
expect(await fs.pathExists(tempPath)).to.be.true();
|
||||||
|
|
||||||
|
execSync(`chflags nouchg ${tempPath}`);
|
||||||
|
expect(shell.moveItemToTrash(tempPath)).to.be.true();
|
||||||
|
expect(await fs.pathExists(tempPath)).to.be.false();
|
||||||
|
});
|
||||||
|
|
||||||
|
ifit(process.platform === 'win32')('returns false when path is in use', async () => {
|
||||||
|
const tempPath = await fs.mkdtemp(path.resolve(app.getPath('temp'), 'electron-shell-spec-'));
|
||||||
|
const cwd = process.cwd();
|
||||||
|
try {
|
||||||
|
// A process working directory is automatically locked on Windows.
|
||||||
|
// This is a workaround to avoid pulling in fs-extras flock method.
|
||||||
|
process.chdir(tempPath);
|
||||||
|
|
||||||
|
expect(shell.moveItemToTrash(tempPath)).to.be.false();
|
||||||
|
expect(await fs.pathExists(tempPath)).to.be.true();
|
||||||
|
} finally {
|
||||||
|
process.chdir(cwd);
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(shell.moveItemToTrash(tempPath)).to.be.true();
|
||||||
|
expect(await fs.pathExists(tempPath)).to.be.false();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue