some architectural changes

+ open/close way to process controllers

Author: code-by-sia

.idea/workspace.xml

@@ -1,6 +1,9 @@
 from common.config import config, getDate, getTime
 from common.controller import Controller
+from common.report import Report
+from common.reportViewer import Viewer
 from controllers.container import Container
+from controllers.reportController import ReportController
 from controllers.static import Static
 from controllers.system import System
 from models.models import Session
@@ -44,12 +47,6 @@ def __init__(self, reuqest):
         self.authentication = AuthControler(self)
         pass
 
-    def RenderFile(self, filename):
-        file = open(config.server_path + "/templates/" + filename, 'r')
-        outp = file.read()
-        self.output += outp
-        pass
-
     def Route(self):
         path = self.request.path
         parsed_path = urlparse(path)
@@ -63,14 +60,18 @@ def Route(self):
         section = spath[1]
         mdl = Container()
 
-
-
         if (section == ''):
             mdl = Container()
         elif (section == 'static'):
             mdl = Static()
         elif (section == 'system'):
             mdl = System()
+        elif(section=='report'):
+            mdl = Report()
+        elif(section=='viewer'):
+            mld=Viewer()
+        elif (section=='template'):
+            mdl = ReportController()
         elif (self.authentication.Authenticated):
             mdl = Controller.controllers[section]
 
@@ -124,11 +125,6 @@ def ProcessRequeset(req):
 
     req.wfile.write(fout)
 
-def loadControllers():
-    __import__('controllers')
-    pass
-
-
 
 if __name__ == '__main__':
 
@@ -139,8 +135,6 @@ def loadControllers():
     HOST = os.getenv('HOST', 'localhost')
     httpd = HTTPServer((HOST, PORT), RequestHandler)
 
-    loadControllers()
-
 
     # config.makeTempLang(Menu.select())
     # DbSetup().SetupDataBase()

app.py

@@ -0,0 +1,2 @@
+from controllers.reports.sale import SaleReport
+

common/__init__.py

@@ -16,7 +16,7 @@ class config:
     server_path = os.path.dirname(os.path.realpath(__file__ + "/..") )
     lang_name = os.getenv('APP_LANG', 'fa')
     app_lang = [lang_name]
-    app_locale = os.getenv('APP_LOCALE', 'en_US')
+    app_locale = os.getenv('APP_LOCALE', 'en_US.utf8')
     app_db_user = 'root';
     app_db_pass = '';
 

common/config.py

@@ -1,7 +1,6 @@
 from common.config import config
 from common.controller import Controller
 
-
 class Report(Controller):
     report = None
     headers = None

common/report.py

@@ -0,0 +1,10 @@
+from common.report import Report
+
+
+def ReportName(name):
+    def wrapper(type):
+        print("Report %s registered by %s" % (name,type))
+        Report.registerReport(name,type)
+        pass
+
+    return  wrapper

common/reportName.py

@@ -1,5 +1,5 @@
 from common.controller import Controller
-
+from common.route import Route
 
 class Viewer(Controller):
 

common/reportViewer.py

@@ -0,0 +1,10 @@
+from common.controller import Controller
+
+
+def Route(name):
+    def wrapper(type):
+        print("Route %s registered by %s" % (name,type))
+        Controller.registerController(name,type)
+        pass
+
+    return  wrapper

common/route.py

@@ -1,40 +1,25 @@
+#  IoC
 from common.controller import Controller
 from common.report import Report
-from common.reportViewer import Viewer
-from controllers.authentication import Authentication
-from controllers.basicInfo import BasicInfo
-from controllers.confirm import Confirm
-from controllers.costs import Costs
-from controllers.dashboard import Dashboard
-from controllers.reportController import ReportController
-from controllers.sales import Sales
-from controllers.testDev import TestDev
-from common.report import Report
-from controllers.reports.cost import CostReport
-from controllers.reports.installment import InstallmentReport
-from controllers.reports.order import OrderReport
-from controllers.reports.sale import SaleReport
-from controllers.reports.saleList import SaleListReport
-from controllers.reports.storage import StorageReport
-
-
-Controller.registerController('auth',Authentication)
-Controller.registerController('info',BasicInfo)
-Controller.registerController('confirm',Confirm)
-Controller.registerController('sale',Sales)
-Controller.registerController('test',TestDev)
-Controller.registerController('costs',Costs)
-Controller.registerController('dashboard',Dashboard)
-
-Controller.registerController('viewer',Viewer)
-Controller.registerController('report',Report)
-Controller.registerController('template',ReportController)
 
+print("Registering controllers started:\n")
+import controllers.basicInfo
+import controllers.authentication 
+import controllers.confirm 
+import controllers.container 
+import controllers.costs 
+import controllers.dashboard 
+import controllers.purchase 
+import controllers.sales 
+import controllers.system 
+import controllers.testDev
 
+print("\n\nRegistering reports started:\n")
+import controllers.reports.cost
+import controllers.reports.installment
+import controllers.reports.order
+import controllers.reports.sale
+import controllers.reports.saleList
+import controllers.reports.storage
 
-Report.registerReport('cost',CostReport)
-Report.registerReport('instullment',InstallmentReport)
-Report.registerReport('order',OrderReport)
-Report.registerReport('sale',SaleReport)
-Report.registerReport('sale-list',SaleListReport)
-Report.registerReport('storage',StorageReport)
+print("\n\n")

controllers/__init__.py

@@ -1,8 +1,10 @@
 from common.config import config
 from common.controller import Controller
+from common.route import Route
 from models.models import User
 
 
+@Route("auth")
 class Authentication(Controller):
     '''
     classdocs