Show proper error message if the root directory doesn't exist on the server

pull/64/head
Kelvin Schoofs 6 years ago
parent b125d4ab74
commit ea3a5e1074

@ -171,13 +171,28 @@ export class Manager implements vscode.FileSystemProvider, vscode.TreeDataProvid
if (sock == null) return reject(null); if (sock == null) return reject(null);
const client = await createSSH(config, sock); const client = await createSSH(config, sock);
if (!client) return reject(null); if (!client) return reject(null);
client.sftp((err, sftp) => { client.sftp(async (err, sftp) => {
if (err) { if (err) {
client.end(); client.end();
return reject(err); return reject(err);
} }
sftp.once('end', () => client.end()); sftp.once('end', () => client.end());
const fs = new SSHFileSystem(name, sftp, config!.root || '/', config!); const fs = new SSHFileSystem(name, sftp, config!.root || '/', config!);
try {
const rootUri = vscode.Uri.parse(`ssh://${name}/${fs.root.replace(/^\//, '')}`);
const stat = await fs.stat(rootUri);
// tslint:disable-next-line:no-bitwise
if (!(stat.type & vscode.FileType.Directory)) {
throw vscode.FileSystemError.FileNotADirectory(rootUri);
}
} catch (e) {
let message = `Couldn't read the root directory '${fs.root}' on the server for SSH FS '${name}'`;
if (e instanceof vscode.FileSystemError) {
message = `Path '${fs.root}' in SSH FS '${name}' is not a directory`;
}
await vscode.window.showErrorMessage(message, 'Okay');
return reject();
}
this.fileSystems.push(fs); this.fileSystems.push(fs);
delete this.creatingFileSystems[name]; delete this.creatingFileSystems[name];
vscode.commands.executeCommand('workbench.files.action.refreshFilesExplorer'); vscode.commands.executeCommand('workbench.files.action.refreshFilesExplorer');

Loading…
Cancel
Save