fix(core): update

This commit is contained in:
Philipp Kunz 2019-10-16 19:15:48 +02:00
parent fea4645cdd
commit 6d856b3647
6 changed files with 69 additions and 60 deletions

View File

@ -7,9 +7,9 @@
"author": "Lossless GmbH", "author": "Lossless GmbH",
"license": "UNLICENSED", "license": "UNLICENSED",
"scripts": { "scripts": {
"test": "tstest test/", "test": "(tstest test/)",
"format": "(gitzone format)", "format": "(gitzone format)",
"build": "echo \"Not needed for now\"" "build": "(tsbuild)"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.17", "@gitzone/tsbuild": "^2.1.17",
@ -38,4 +38,4 @@
"npmextra.json", "npmextra.json",
"readme.md" "readme.md"
] ]
} }

View File

@ -62,7 +62,6 @@ tap.test('should get base directory', async () => {
const files = await baseDirectory.listFiles(); const files = await baseDirectory.listFiles();
}); });
tap.test('clean up directory style tests', async () => { tap.test('clean up directory style tests', async () => {
await myBucket.fastRemove('dir1/file1.txt'); await myBucket.fastRemove('dir1/file1.txt');
await myBucket.fastRemove('dir1/file2.txt'); await myBucket.fastRemove('dir1/file2.txt');
@ -71,5 +70,4 @@ tap.test('clean up directory style tests', async () => {
await myBucket.fastRemove('file1.txt'); await myBucket.fastRemove('file1.txt');
}); });
tap.start(); tap.start();

View File

@ -10,7 +10,7 @@ export class Bucket {
}); });
if (foundBucket) { if (foundBucket) {
console.log(`bucket with name ${bucketNameArg} exists.`) console.log(`bucket with name ${bucketNameArg} exists.`);
console.log(`Taking this as base for new Bucket instance`); console.log(`Taking this as base for new Bucket instance`);
return new this(smartbucketRef, bucketNameArg); return new this(smartbucketRef, bucketNameArg);
} else { } else {
@ -42,7 +42,6 @@ export class Bucket {
return new Directory(this, null, ''); return new Directory(this, null, '');
} }
// =============== // ===============
// Fast Operations // Fast Operations
// =============== // ===============
@ -52,7 +51,9 @@ export class Bucket {
*/ */
public async fastStore(pathArg: string, fileContent: string) { public async fastStore(pathArg: string, fileContent: string) {
const streamIntake = new plugins.streamfunction.Intake(); const streamIntake = new plugins.streamfunction.Intake();
const putPromise = this.smartbucketRef.minioClient.putObject(this.name, pathArg, streamIntake.getReadable()).catch(e => console.log(e)); const putPromise = this.smartbucketRef.minioClient
.putObject(this.name, pathArg, streamIntake.getReadable())
.catch(e => console.log(e));
streamIntake.pushData(fileContent); streamIntake.pushData(fileContent);
streamIntake.signalEnd(); streamIntake.signalEnd();
await putPromise; await putPromise;
@ -63,16 +64,21 @@ export class Bucket {
*/ */
public async fastGet(pathArg: string) { public async fastGet(pathArg: string) {
const done = plugins.smartpromise.defer(); const done = plugins.smartpromise.defer();
const fileStream = await this.smartbucketRef.minioClient.getObject(this.name, pathArg).catch(e => console.log(e)); const fileStream = await this.smartbucketRef.minioClient
.getObject(this.name, pathArg)
.catch(e => console.log(e));
let completeFile: string = ''; let completeFile: string = '';
const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(async (chunk) => { const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(
const chunkString = chunk.toString(); async chunk => {
completeFile += chunkString; const chunkString = chunk.toString();
return chunk; completeFile += chunkString;
}, async (cb) => { return chunk;
done.resolve(); },
return Buffer.from(''); async cb => {
}); done.resolve();
return Buffer.from('');
}
);
if (!fileStream) { if (!fileStream) {
return null; return null;
@ -86,7 +92,7 @@ export class Bucket {
/** /**
* removeObject * removeObject
*/ */
public async fastRemove (pathArg: string) { public async fastRemove(pathArg: string) {
await this.smartbucketRef.minioClient.removeObject(this.name, pathArg); await this.smartbucketRef.minioClient.removeObject(this.name, pathArg);
} }
} }

View File

@ -34,7 +34,7 @@ export class Directory {
*/ */
public getDirectoryLevel(): number { public getDirectoryLevel(): number {
return this.getParentDirectories().length; return this.getParentDirectories().length;
}; }
/** /**
* updates the base path * updates the base path
@ -42,7 +42,7 @@ export class Directory {
public getBasePath(): string { public getBasePath(): string {
const parentDirectories = this.getParentDirectories(); const parentDirectories = this.getParentDirectories();
let basePath = ''; let basePath = '';
for(const parentDir of parentDirectories) { for (const parentDir of parentDirectories) {
basePath = parentDir.name + '/' + basePath; basePath = parentDir.name + '/' + basePath;
} }
return basePath; return basePath;
@ -58,11 +58,14 @@ export class Directory {
this.getBasePath() this.getBasePath()
); );
const fileArray: File[] = []; const fileArray: File[] = [];
const duplexStream = plugins.streamfunction.createDuplexStream<string, void>(async fileName => { const duplexStream = plugins.streamfunction.createDuplexStream<string, void>(
fileArray.push(new File(this, fileName)); async fileName => {
}, async (tools) => { fileArray.push(new File(this, fileName));
done.resolve(); },
}); async tools => {
done.resolve();
}
);
fileNameStream.pipe(duplexStream); fileNameStream.pipe(duplexStream);
await done.promise; await done.promise;
return fileArray; return fileArray;
@ -79,19 +82,22 @@ export class Directory {
true true
); );
const directoryArray: Directory[] = []; const directoryArray: Directory[] = [];
const duplexStream = plugins.streamfunction.createDuplexStream<plugins.minio.BucketItem, void>(async fileName => { const duplexStream = plugins.streamfunction.createDuplexStream<plugins.minio.BucketItem, void>(
console.log(fileName); async fileName => {
const subtractedPath = fileName.name.replace(this.getBasePath(), ''); console.log(fileName);
if (subtractedPath.includes('/')) { const subtractedPath = fileName.name.replace(this.getBasePath(), '');
const dirName = fileName.name.split('/')[0]; if (subtractedPath.includes('/')) {
if (directoryArray.find(directory => directory.name === dirName)) { const dirName = fileName.name.split('/')[0];
return; if (directoryArray.find(directory => directory.name === dirName)) {
return;
}
directoryArray.push(new Directory(this.bucketRef, this, dirName));
} }
directoryArray.push(new Directory(this.bucketRef, this, dirName)); },
async tools => {
done.resolve();
} }
}, async (tools) => { );
done.resolve();
});
completeDirStream.pipe(duplexStream); completeDirStream.pipe(duplexStream);
await done.promise; await done.promise;
return directoryArray; return directoryArray;
@ -119,14 +125,13 @@ export class Directory {
/** /**
* moves the directory * moves the directory
*/ */
public async move () { public async move() {
// TODO // TODO
} }
/** /**
* creates a file within this directory * creates a file within this directory
* @param relativePathArg * @param relativePathArg
*/ */
public async createFile(relativePathArg) { public async createFile(relativePathArg) {
let completeFilePath: string = ''; let completeFilePath: string = '';

View File

@ -14,11 +14,7 @@ export class File {
fileName: string, fileName: string,
fileContent: string fileContent: string
) { ) {
await this.createFileFromBuffer( await this.createFileFromBuffer(dirArg, fileName, Buffer.from(fileContent));
dirArg,
fileName,
Buffer.from(fileContent)
);
} }
public static async createFileFromBuffer( public static async createFileFromBuffer(
@ -53,15 +49,20 @@ export class File {
public async getContentAsBuffer() { public async getContentAsBuffer() {
const done = plugins.smartpromise.defer(); const done = plugins.smartpromise.defer();
const fileStream = await this.directoryRef.bucketRef.smartbucketRef.minioClient.getObject(this.directoryRef.bucketRef.name, this.path).catch(e => console.log(e)); const fileStream = await this.directoryRef.bucketRef.smartbucketRef.minioClient
.getObject(this.directoryRef.bucketRef.name, this.path)
.catch(e => console.log(e));
let completeFile = new Buffer(''); let completeFile = new Buffer('');
const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(async (chunk) => { const duplexStream = plugins.streamfunction.createDuplexStream<Buffer, Buffer>(
completeFile = Buffer.concat([chunk]); async chunk => {
return chunk; completeFile = Buffer.concat([chunk]);
}, async (cb) => { return chunk;
done.resolve(); },
return Buffer.from(''); async cb => {
}); done.resolve();
return Buffer.from('');
}
);
if (!fileStream) { if (!fileStream) {
return null; return null;
@ -80,8 +81,11 @@ export class File {
/** /**
* removes this file * removes this file
*/ */
public async remove () { public async remove() {
await this.directoryRef.bucketRef.smartbucketRef.minioClient.removeObject(this.directoryRef.bucketRef.name, this.path); await this.directoryRef.bucketRef.smartbucketRef.minioClient.removeObject(
this.directoryRef.bucketRef.name,
this.path
);
await this.directoryRef.listFiles(); await this.directoryRef.listFiles();
} }
} }

View File

@ -1,9 +1,7 @@
// node native // node native
import * as path from 'path'; import * as path from 'path';
export { export { path };
path
};
import * as smartpath from '@pushrocks/smartpath'; import * as smartpath from '@pushrocks/smartpath';
import * as smartpromise from '@pushrocks/smartpromise'; import * as smartpromise from '@pushrocks/smartpromise';
@ -14,6 +12,4 @@ export { smartpath, smartpromise, streamfunction };
// third party scope // third party scope
import * as minio from 'minio'; import * as minio from 'minio';
export { export { minio };
minio
};