mirror of
https://github.com/n8n-io/n8n.git
synced 2024-12-24 04:04:06 -08:00
🐛 Fix issue that shows wrong paths when using FTP node (#2143)
This commit is contained in:
parent
31da7a7bd8
commit
8dd0d547a2
|
@ -648,23 +648,22 @@ export class Ftp implements INodeType {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function normalizeFtpItem(input: ftpClient.ListingElement, path: string) {
|
function normalizeFtpItem(input: ftpClient.ListingElement, path: string, recursive = false) {
|
||||||
const item = input as unknown as ReturnFtpItem;
|
const item = input as unknown as ReturnFtpItem;
|
||||||
item.modifyTime = input.date;
|
item.modifyTime = input.date;
|
||||||
item.path = `${path}${path.endsWith('/') ? '' : '/'}${item.name}`;
|
item.path = (!recursive) ? `${path}${path.endsWith('/') ? '' : '/'}${item.name}` : path;
|
||||||
// @ts-ignore
|
//@ts-ignore
|
||||||
item.date = undefined;
|
item.date = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function normalizeSFtpItem(input: sftpClient.FileInfo, path: string, recursive = false) {
|
||||||
function normalizeSFtpItem(input: sftpClient.FileInfo, path: string) {
|
|
||||||
const item = input as unknown as ReturnFtpItem;
|
const item = input as unknown as ReturnFtpItem;
|
||||||
item.accessTime = new Date(input.accessTime);
|
item.accessTime = new Date(input.accessTime);
|
||||||
item.modifyTime = new Date(input.modifyTime);
|
item.modifyTime = new Date(input.modifyTime);
|
||||||
item.path = `${path}${path.endsWith('/') ? '' : '/'}${item.name}`;
|
item.path = (!recursive) ? `${path}${path.endsWith('/') ? '' : '/'}${item.name}` : path;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function callRecursiveList(path: string, client: sftpClient | ftpClient, normalizeFunction: (input: ftpClient.ListingElement & sftpClient.FileInfo, path: string) => void) {
|
async function callRecursiveList(path: string, client: sftpClient | ftpClient, normalizeFunction: (input: ftpClient.ListingElement & sftpClient.FileInfo, path: string, recursive?: boolean) => void) {
|
||||||
const pathArray : string[] = [path];
|
const pathArray : string[] = [path];
|
||||||
let currentPath = path;
|
let currentPath = path;
|
||||||
const directoryItems : sftpClient.FileInfo[] = [];
|
const directoryItems : sftpClient.FileInfo[] = [];
|
||||||
|
@ -687,7 +686,7 @@ async function callRecursiveList(path: string, client: sftpClient | ftpClient, n
|
||||||
pathArray.push(currentPath);
|
pathArray.push(currentPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
normalizeFunction(item as ftpClient.ListingElement & sftpClient.FileInfo, currentPath);
|
normalizeFunction(item as ftpClient.ListingElement & sftpClient.FileInfo, currentPath, true);
|
||||||
directoryItems.push(item);
|
directoryItems.push(item);
|
||||||
});
|
});
|
||||||
index++;
|
index++;
|
||||||
|
|
Loading…
Reference in a new issue