From 80638f1c986a04bcc58c826319cd76603ed69a0c Mon Sep 17 00:00:00 2001 From: montaghanmy Date: Tue, 7 Nov 2023 14:11:04 +0100 Subject: [PATCH 1/3] feat: added default local home dir --- tdrive/backend/node/config/default.json | 2 +- .../backend/node/src/core/platform/services/storage/index.ts | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tdrive/backend/node/config/default.json b/tdrive/backend/node/config/default.json index 71adef60b..ffa4dd334 100644 --- a/tdrive/backend/node/config/default.json +++ b/tdrive/backend/node/config/default.json @@ -132,7 +132,7 @@ "secretKey":"x1yz" }, "local":{ - "path":"/storage/" + "path":"/tdrive" } }, "email-pusher":{ diff --git a/tdrive/backend/node/src/core/platform/services/storage/index.ts b/tdrive/backend/node/src/core/platform/services/storage/index.ts index 0dc5466aa..b1d739f3b 100644 --- a/tdrive/backend/node/src/core/platform/services/storage/index.ts +++ b/tdrive/backend/node/src/core/platform/services/storage/index.ts @@ -23,7 +23,7 @@ export default class StorageService extends TdriveService implements private encryptionOptions: EncryptionConfiguration; private algorithm = "aes-256-cbc"; - private homeDir = "/tdrive"; + private homeDir = this.configuration.get("local.path", "/tdrive"); api(): StorageAPI { return this; @@ -48,6 +48,9 @@ export default class StorageService extends TdriveService implements accessKey: this.configuration.get("S3.accessKey"), secretKey: this.configuration.get("S3.secretKey"), }); + } else if (type === "local") { + logger.info("Using 'local' connector for storage."); + if(!this.homeDir) this.homeDir = "/tdrive"; } logger.info( `Using 'local' connector for storage${ From a519ac6873164aecf69b258f8c714917d424d75e Mon Sep 17 00:00:00 2001 From: montaghanmy Date: Tue, 7 Nov 2023 14:15:10 +0100 Subject: [PATCH 2/3] feat: set the default storage backend to local --- tdrive/backend/node/src/core/platform/services/storage/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrive/backend/node/src/core/platform/services/storage/index.ts b/tdrive/backend/node/src/core/platform/services/storage/index.ts index b1d739f3b..5554f3be0 100644 --- a/tdrive/backend/node/src/core/platform/services/storage/index.ts +++ b/tdrive/backend/node/src/core/platform/services/storage/index.ts @@ -48,7 +48,7 @@ export default class StorageService extends TdriveService implements accessKey: this.configuration.get("S3.accessKey"), secretKey: this.configuration.get("S3.secretKey"), }); - } else if (type === "local") { + } else { logger.info("Using 'local' connector for storage."); if(!this.homeDir) this.homeDir = "/tdrive"; } From e8c1c39de37fe474947283b97022202c92ea39cb Mon Sep 17 00:00:00 2001 From: montaghanmy Date: Tue, 7 Nov 2023 14:28:52 +0100 Subject: [PATCH 3/3] fix: prettier --- tdrive/backend/node/src/core/platform/services/storage/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrive/backend/node/src/core/platform/services/storage/index.ts b/tdrive/backend/node/src/core/platform/services/storage/index.ts index 5554f3be0..e4d3049b5 100644 --- a/tdrive/backend/node/src/core/platform/services/storage/index.ts +++ b/tdrive/backend/node/src/core/platform/services/storage/index.ts @@ -50,7 +50,7 @@ export default class StorageService extends TdriveService implements }); } else { logger.info("Using 'local' connector for storage."); - if(!this.homeDir) this.homeDir = "/tdrive"; + if (!this.homeDir) this.homeDir = "/tdrive"; } logger.info( `Using 'local' connector for storage${