push.rocks/smartbucket
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(core): update

Browse Source
This commit is contained in:
Philipp Kunz
2019-10-20 01:18:13 +02:00
parent 9ad70a9942
commit aa209e87c1
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ts/smartbucket.classes.directory.ts
View File

@ -43,6 +43,10 @@ export class Directory {
const parentDirectories = this.getParentDirectories();
let basePath = '';
for (const parentDir of parentDirectories) {
if (parentDir.name === '') {
basePath = this.name;
continue;
}
basePath = parentDir.name + '/' + this.name;
}
return basePath;
@ -91,9 +95,12 @@ export class Directory {
const directoryArray: Directory[] = [];
const duplexStream = plugins.streamfunction.createDuplexStream<plugins.minio.BucketItem, void>(
async bucketItem => {
const subtractedPath = bucketItem.name.replace(this.getBasePath(), '');
let subtractedPath = bucketItem.name.replace(this.getBasePath(), '');
if (subtractedPath.startsWith('/')) {
subtractedPath = subtractedPath.substr(1);
}
if (subtractedPath.includes('/')) {
const dirName = bucketItem.name.split('/')[0];
const dirName = subtractedPath.split('/')[0];
if (directoryArray.find(directory => directory.name === dirName)) {
return;
}
@ -124,11 +131,20 @@ export class Directory {
* gets a sub directory
*/
public async getSubDirectoryByName(dirNameArg: string): Promise<Directory> {
// TODO: make this recursive
const directories = await this.listDirectories();
return directories.find(directory => {
return directory.name === dirNameArg;
});
const dirNameArray = dirNameArg.split('/');
const getDirectory = async (directoryArg: Directory, dirNameToSearch: string) => {
const directories = await directoryArg.listDirectories();
return directories.find(directory => {
return directory.name === dirNameToSearch;
});
};
let wantedDirectory: Directory;
for (const dirNameToSearch of dirNameArray) {
const directoryToSearchIn = wantedDirectory ? wantedDirectory : this;
wantedDirectory = await getDirectory(directoryToSearchIn, dirNameToSearch);
}
return wantedDirectory;
}
/**