v0.0.6

+ Запросы объеденины в соответствующие модули
+ Оптимизация кода

source/daster.d

@@ -16,17 +16,8 @@ import verinfo;
 import pgdb;
 import structures;
 
-import requests.listsgroups;
-import requests.groupnumbers;
-import requests.editnumber;
-import requests.updatenumber;
-import requests.addnumber;
-import requests.delnumber;
-import requests.writenumber;
-import requests.smsnumbers;
-import requests.listsms;
-import requests.viewsms;
-import requests.delsms;
+import requests.numbers;
+import requests.sms;
 
 static ServerInfo serverInfo;
 
@@ -82,15 +73,16 @@ int main(string[] args) {
     }
 
     rc.read(flagSettings);
-    rcAsteriskDB();
-    auto webHost = rcWebHost();
 
+    auto webHost = rcWebHost();
     serverInfo = ServerInfo(webHost.title);
 
     if (webHost.loglevel != -1) log.level(webHost.loglevel);
     if (webHost.logoutput) log.output(webHost.logoutput);
     if (webHost.logfile.length) log.file(webHost.logfile);
 
+    rcAsteriskDB();
+
     auto router = new URLRouter;
     router.post("/", &postReq);
     router.get("/", &getReq);
@@ -176,45 +168,47 @@ void postReq(HTTPServerRequest req, HTTPServerResponse res) {
     //     return;
     // }
 
+    log.d("json request: " ~ jsr.to!string);
+
     switch (query) {
-        case "listsgroups":
-            listsGroups(req, res);
-            break;
-        case "groupnumbers":
-            groupNumbers(req, res);
-            break;
     //     case "authorization":
     //         authorization(req, res);
     //         break;
     //     case "logout":
     //         logout(req, res);
     //         break;
+        case "listnumbergroups":
+            getListNumberGroups(req, res);
+            break;
+        case "listgroupnumbers":
+            getListGroupNumbers(req, res);
+            break;
+        case "viewnumber":
+            getViewNumber(req, res);
+            break;
         case "addnumber":
-            addNumber(req, res);
+            getAddNumber(req, res);
             break;
         case "writenumber":
-            writeNumber(req, res);
-            break;
-        case "editnumber":
-            editNumber(req, res);
+            sendWriteNumber(req, res);
             break;
         case "updatenumber":
-            updateNumber(req, res);
+            sendUpdateNumber(req, res);
             break;
         case "delnumber":
-            delNumber(req, res);
+            sendDelNumber(req, res);
             break;
-        case "smsnumbers":
-            smsNumbers(req, res);
+        case "listsmsgroups":
+            getListSMSGroups(req, res);
             break;
-        case "listsms":
-            listSMS(req, res);
+        case "listgroupsms":
+            getListGroupSMS(req, res);
             break;
         case "viewsms":
-            viewSMS(req, res);
+            getViewSMS(req, res);
             break;
         case "delsms":
-            delSMS(req, res);
+            sendDelSMS(req, res);
             break;
         default:
             res.redirect("/");
@@ -260,7 +254,7 @@ void rcAsteriskDB() {
             " password=" ~ asteriskDB["password"]
         );
     } catch (Exception e) {
-        log.c(e);
+        log.c(e.msg);
         exit(1);
     }    
 }