Skip to content

Fix FTP explorer subdirectory file retrieval (#1155) #1290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fhwvtqdc2q-svg wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix FTP explorer subdirectory file retrieval (#1155) #1290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions tree-view-sample/src/ftpExplorer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export class FtpModel {

client.end();

return c(this.sort(list.map(entry => ({ resource: vscode.Uri.parse(`ftp://${this.host}///${entry.name}`), isDirectory: entry.type === 'd' }))));
return c(this.sort(list.map(entry => ({ resource: vscode.Uri.parse(`ftp://${this.host}//${entry.name}`), isDirectory: entry.type === 'd' }))));
});
});
});
Expand All @@ -58,7 +58,12 @@ export class FtpModel {

client.end();

return c(this.sort(list.map(entry => ({ resource: vscode.Uri.parse(`${node.resource.fsPath}/${entry.name}`), isDirectory: entry.type === 'd' }))));
return c(this.sort(list.map(entry => {
const path = node.resource.path.endsWith('/')
? `${node.resource.path}${entry.name}`
: `${node.resource.path}/${entry.name}`;
return { resource: node.resource.with({ path }), isDirectory: entry.type === 'd' };
})));
});
});
});
Expand All @@ -81,7 +86,7 @@ export class FtpModel {
public getContent(resource: vscode.Uri): Thenable<string> {
return this.connect().then(client => {
return new Promise((c, e) => {
client.get(resource.path.substr(2), (err, stream) => {
client.get(resource.path.substr(1), (err, stream) => {
if (err) {
return e(err);
}
Expand Down Expand Up @@ -148,7 +153,7 @@ export class FtpExplorer {

constructor(context: vscode.ExtensionContext) {
/* Please note that login information is hardcoded only for this example purpose and recommended not to do it in general. */
const ftpModel = new FtpModel('mirror.switch.ch', 'anonymous', 'anonymous@anonymous.de');
const ftpModel = new FtpModel('test.rebex.net', 'anonymous', 'anonymous@anonymous.de');
const treeDataProvider = new FtpTreeDataProvider(ftpModel);
context.subscriptions.push(vscode.workspace.registerTextDocumentContentProvider('ftp', treeDataProvider));

Expand Down