From fdd221f8a7280c14b6ed6f141f3fa865372c0add Mon Sep 17 00:00:00 2001 From: srgooglo Date: Tue, 20 Jul 2021 14:49:52 +0200 Subject: [PATCH] allow load controller from --- .DS_Store | Bin 6148 -> 8196 bytes src/classes/Authorization/index.js | 5 ----- src/classes/Database/index.js | 5 ----- src/classes/index.js | 2 -- src/lib/fetchController/index.js | 4 ++-- src/server/index.js | 2 +- 6 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 src/classes/Authorization/index.js delete mode 100644 src/classes/Database/index.js diff --git a/.DS_Store b/.DS_Store index bf71b305bc83d35851fc98569d0cbbcf0c29a704..c32646fc0ec96321a3c03547d1b402e6d590f389 100644 GIT binary patch literal 8196 zcmeHLzl#$=6n>NBB+&zNf|5qq@<7}pg&@K~?#LAuHeO+&Xnq=_$?cK5h$2Gz1Anv@ zg4l?S*jNkx4cf?ICHNPJR{Fh}N%qZd60JnY%(3$}^S(Fpz3=U8ZbC$AbJ!{qm53;h zi*4~3x+#tQe5G2(j;z8e#8a4{R*TkHK5c^g6$hHkZdi=<*8U}>yZq< z58ge?8-^2a%q{J8S?Tv(4k~tOkM><&>U4tF1m`k4I11dvC%GM7U;F%YTxq+8RBoEz z;iqbtnhM}Iq(1F}V@N$zypv#h0F+cPPi?w~=YwNMw^4oUb+__*r#}}veK|41tT^6t zGOj?EX$!Me=@M)RwOj5=dN;_3} zSv8{iI#4!V*68JhbK_@l;*Bek_DcQje>w%ak1Phr!|XFC?=sXoN9F-4zAdBzS(9~% z&;MJqfB#=dZG6&Rfkjb3<*M7&O=N4&)~UQR7zuFIaB*YY$XFeMjv+j*kK?fRIIhP6 f>#JBhGFFEoMu)=wqaOm|Gll>D=R)|lkP7?;A~eyW delta 126 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5sJ6q~50$SAWhU^g?P%w!&cj>!iEnkHum z7ENXn%Ab5$XyfEP!t*C*ixx~w4Oq<1!6C>D)CU9t+(5z=WW>hA@640=WjsL!GB805 N2ieE4Ii6<@GXTD(8P)&* diff --git a/src/classes/Authorization/index.js b/src/classes/Authorization/index.js deleted file mode 100644 index b44bb68..0000000 --- a/src/classes/Authorization/index.js +++ /dev/null @@ -1,5 +0,0 @@ -class Authorization { - -} - -module.exports = { Authorization } \ No newline at end of file diff --git a/src/classes/Database/index.js b/src/classes/Database/index.js deleted file mode 100644 index 3c48e01..0000000 --- a/src/classes/Database/index.js +++ /dev/null @@ -1,5 +0,0 @@ -class Database { - -} - -module.exports = { Database } \ No newline at end of file diff --git a/src/classes/index.js b/src/classes/index.js index 9a4a55f..57c4519 100644 --- a/src/classes/index.js +++ b/src/classes/index.js @@ -1,4 +1,2 @@ -export { Authorization } from './Authorization' export { Controller } from './Controller' -export { Database } from './Database' export { Storage } from './Storage' \ No newline at end of file diff --git a/src/lib/fetchController/index.js b/src/lib/fetchController/index.js index d320c1a..e988bd4 100644 --- a/src/lib/fetchController/index.js +++ b/src/lib/fetchController/index.js @@ -1,9 +1,9 @@ const fs = require("fs") const path = require("path") -function fetchController(key) { +function fetchController(key, from) { try { - const controllersPath = global.controllersPath ?? path.resolve(process.cwd(), `controllers`) + const controllersPath = from ?? path.resolve(process.cwd(), `controllers`) const controllerPath = path.join(controllersPath, key) if (fs.existsSync(controllerPath)) { diff --git a/src/server/index.js b/src/server/index.js index ade8e20..acb0016 100644 --- a/src/server/index.js +++ b/src/server/index.js @@ -213,7 +213,7 @@ class Server { if (typeof this.controllers[endpoint.controller] !== "undefined") { endpoint.controller = this.controllers[endpoint.controller] } else { - endpoint.controller = fetchController(endpoint.controller) + endpoint.controller = fetchController(endpoint.controller, this.params.controllersPath) } }