chore(*): organize directory structure

MelonCTech · Nov 15, 2023 · 50ec4f4 · 50ec4f4
1 parent 2af3055
commit 50ec4f4
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/index.m → controllers/index.m b/index.m → controllers/index.m
@@ -1,4 +1,4 @@
-#include "@/conf/conf.m"
+#include "@/../conf/conf.m"
 
 F = Import('file');
 S = Import('sys');
@@ -12,7 +12,7 @@
     }
 
     @index() {
-        path = S.path('@/index.html');
+        path = S.path('@/../web/index.html');
         f = $F;
         if (!f.open(path, 'r')) {
             R['code'] = 404;

diff --git a/proc.m → controllers/proc.m b/proc.m → controllers/proc.m
@@ -1,5 +1,5 @@
-#include "@/log.m"
-#include "@/validator.m"
+#include "@/../utils/log.m"
+#include "@/../utils/validator.m"
 
 J = Import('json');
 S = Import('sys');
@@ -211,7 +211,7 @@
 
     for (i = 0; i < n; ++i) {
         alias = name + ':' + i;
-        Eval('@/task.m', J.encode([
+        Eval('@/../coroutines/task.m', J.encode([
             'conf': prog,
             'alias': alias,
         ]), false, alias);

diff --git a/bootstrap.m → coroutines/bootstrap.m b/bootstrap.m → coroutines/bootstrap.m
@@ -1,4 +1,4 @@
-#include "@/log.m"
+#include "@/../utils/log.m"
 
 sys = Import('sys');
 

diff --git a/http.m → coroutines/http.m b/http.m → coroutines/http.m
@@ -1,5 +1,5 @@
-#include "@/proc.m"
-#include "@/index.m"
+#include "@/../controllers/proc.m"
+#include "@/../controllers/index.m"
 
 sys = Import('sys');
 net = Import('net');

diff --git a/task.m → coroutines/task.m b/task.m → coroutines/task.m
@@ -1,4 +1,4 @@
-#include "@/log.m"
+#include "@/../utils/log.m"
 
 j = Import('json');
 s = Import('sys');

diff --git a/meproc.m b/meproc.m
@@ -1,4 +1,4 @@
-#include "@/log.m"
+#include "@/utils/log.m"
 
 net = Import('net');
 mq = Import('mq');
@@ -10,10 +10,10 @@
     return;
 } fi
 
-Log('info', "Meproc v1.0.2. Listen on: " + Conf['ip'] + ':' + Conf['port']);
+Log('info', "Meproc v1.0.3. Listen on: " + Conf['ip'] + ':' + Conf['port']);
 
-Eval('@/http.m');
-Eval('@/bootstrap.m', nil, false, 'bootstrap');
+Eval('@/coroutines/http.m');
+Eval('@/coroutines/bootstrap.m', nil, false, 'bootstrap');
 
 while (1) {
     fd = net.tcp_accept(listenfd);

diff --git a/log.m → utils/log.m b/log.m → utils/log.m
@@ -1,6 +1,6 @@
 #if !M_LOG
 #define M_LOG
-#include "@/conf/conf.m"
+#include "@/../conf/conf.m"
 
 Sys = Import('sys');
 F = Import('file');

diff --git a/validator.m → utils/validator.m b/validator.m → utils/validator.m
diff --git a/index.html → web/index.html b/index.html → web/index.html