New branch: Bottle

config/database.py

@@ -1,4 +1,4 @@
-main_db = {
+db_main = {
     'host'       : 'localhost',
     'user'       : 'root',
     'password'   : '',

config/directory.py

@@ -1,30 +1,13 @@
-import os
+from core import template
-from core import templatestaticdir
 
-# pages directory
 page = {
-    'public'    :'page/public'  ,
+    'public'    :'pages/public'
-    'error'     :'page/error' # Non-template
 }
 
-# public staticdir
+static = [
-dirconfig = {
-    '/' :
     {
-        'tools.sessions.on'     : True ,
+        "route" :"/css/<filepath:re:.*\.(css|sass|css.map)>",
-        'tools.staticdir.root'  : os.path.abspath(os.getcwd()) ,
+        "root"  :"./static/css"
-    },
+    }
-    '/css' :
+]
-    {
+template.add(static, "templates")
-        'tools.staticdir.on'    : True ,
-        'tools.staticdir.dir'   : './static/css' ,
-    },
-    '/js' :
-    {
-        'tools.staticdir.on'    : True ,
-        'tools.staticdir.dir'   : './static/js' ,
-    },
-}
-
-# template staticdir: dirconfig  dirtemplate
-templatestaticdir.add(dirconfig, "templates")

config/globalvar.py

@@ -1,4 +1,4 @@
-baseurl = "http://localhost:81"
+baseurl = "http://127.0.0.1:15001"
 title    = "CostaPy"
 
 menu = {
@@ -10,13 +10,13 @@ menu = {
                 "roles":["guest"]
             },
             {
-                "name":"About",
+                "name":"Profile",
                 "href":"#",
                 "roles":["guest"]
             },
             {
                 "name":"CostaPy Website",
-                "href":"https://costapy.ditaajipratama.com",
+                "href":"https://costapy.ditaajipratama.net",
                 "roles":["guest"]
             }
         ]

config/server.py

@@ -1,20 +1,16 @@
-from config import directory
+host        = "localhost"
+port        = 15001
+reloader    = False
+debug       = False
+server      = 'gunicorn' # default = 'wsgiref'
 
-update = {
+# cors
-    'server.socket_host'                : "hostname"    ,
+# session
-    'server.socket_port'                : "port"        ,
 
-    'cors.expose.on'                    : True          ,
+# error page 403
-    'tools.sessions.on'                 : True          ,
+# error page 404
+# error page 500
 
-    'engine.autoreload.on'              : False         ,
+# max_request_body_size   = 800 * 1024 * 1024 ,   # Multiply for 800MB result
-    'request.show_tracebacks'           : False         ,
+# socket timeout = 60
-
+# response timeout = 3600
-    'error_page.403'                    : f'{directory.page["error"]}/403.html' ,
-    'error_page.404'                    : f'{directory.page["error"]}/404.html' ,
-    'error_page.500'                    : f'{directory.page["error"]}/500.html' ,
-
-    'server.max_request_body_size'      : 800 * 1024 * 1024 , # 800MB; Default 100MB
-    'server.socket_timeout'             : 60                , # Default 10s
-    'response.timeout'                  : 3600              , # Default 300s
-}

core/staticdir.py

@@ -0,0 +1,9 @@
+from    bottle      import Bottle, get, static_file
+from    config      import directory
+
+app = Bottle()
+
+for items in directory.static:
+    @app.get(items['route'])
+    def static_items(filepath):
+        return static_file(filepath, root=items['root'])

core/template.py

@@ -1,9 +1,8 @@
 import os
 
 def add(dirconfig, template_directory):
-    template_directory  = "templates"
+    template_list = [d for d in os.listdir(template_directory) if os.path.isdir(os.path.join(template_directory, d))]
-    template_list       = [d for d in os.listdir(template_directory) if os.path.isdir(os.path.join(template_directory, d))]
     for template_name in template_list:
         template_module = __import__(f"{template_directory}.{template_name}.main", fromlist=["static"])
         for static in getattr(template_module, "static", []):
-            dirconfig[ static['name'] ] = static['value']
+            dirconfig.append(static)

core/uploading.py

@@ -1,40 +0,0 @@
-import  os
-import  cherrypy
-
-def main(file, rename, directory):
-    try:
-        os.makedirs(directory, exist_ok=True)
-    except OSError as error:
-        print(error)
-    try:
-        upload_path     = directory
-        upload_filename = file.filename
-        upload_rename   = rename
-        upload_file     = os.path.normpath(os.path.join(upload_path, upload_rename))
-        upload_size     = 0
-
-        print("UPLOADING CORE: Directory: "+directory+"/"+rename)
-        if (os.path.isfile(directory+"/"+rename)):
-            print("UPLOADING CORE: Is exists! Removing!")
-            try:
-                os.remove(directory+"/"+rename)
-            except Exception as e:
-                print(f"UPLOADING CORE: removing failed: {e}")
-        else:
-            print("UPLOADING CORE: Is not exists! Removing skipped!")
-        with open(upload_file, 'wb') as upload_result:
-            while True:
-                data = file.file.read(8192)
-                if not data:
-                    break
-                upload_result.write(data)
-                upload_size += len(data)
-
-        print("UPLOAD PATH: " + str(upload_path))
-        print("UPLOAD FILENAME: " + str(upload_filename))
-        print("UPLOAD RENAME: " + str(upload_rename))
-        print("UPLOAD FILE: " + str(upload_file))
-        print("UPLOAD SIZE: " + str(upload_size))
-
-    except Exception as e:
-        print(f"ERROR CORE UPLOADING: {e}")

costa.py

@@ -1,25 +1,20 @@
-import sys
+import  sys
-import cherrypy
+from    bottle      import Bottle, run
-import cherrypy_cors
-import handler
 
-from config import server
+import  handler
-from config import directory
 
-if __name__ == '__main__':
+from    core        import staticdir
+from    config      import server
 
-    dirconfig   = directory.dirconfig
+app = Bottle()
-    update      = server.update
 
-    if len(sys.argv) >= 3:
+app.merge(handler.app)
+app.merge(staticdir.app)
 
-        update["server.socket_host"]    = sys.argv[1]
+run(app,
-        update["server.socket_port"]    = int(sys.argv[2])
+    host = server.host,
-
+    port = server.port,
-        cherrypy_cors.install()
+    reloader = server.reloader,
-        cherrypy.config.update  ( update                                )
+    server = server.server,
-        cherrypy.quickstart     ( handler.handler(), config = dirconfig )
+    debug = server.debug
-
+)
-    else:
-        print ("Usage   : python<ver>   costa.py    <ip_address>    <port>  <service_name>")
-        print ("Example : python3       costa.py    localhost       81      CostaPySample")

handler.py

@@ -1,17 +1,16 @@
-import cherrypy
+from    bottle                  import Bottle, route
-import json
+from    config                  import directory
-import config.directory		as directory
 
-import templates.bare.main	as bare
+import  templates.bare.main     as template_public
+import  modules.public.home     as public_home
 
-import modules.public.home	as public_home
+app = Bottle()
 
-@cherrypy.tools.accept(media="application/json")
+@app.route('/')
-class handler():
+def index():
-
+    params = {
-    def index(self, **kwargs):
+        "mako":{
-        kwargs["mako"] = {
+            "website" : template_public.main(directory.page["public"], "home")
-            "website" : bare.main(directory.page["public"], "home")
         }
-        return public_home.main().html(kwargs)
+    }
-    index.exposed = True
+    return public_home.main().html(params)

install.sh

@@ -1,8 +1,4 @@
 sudo apt-get install -y python3-pip
 pip install --upgrade pip
-pip install cherrypy
+pip install bottle
-pip install cherrypy-cors
+pip install gunicorn
-pip install mako
-pip install mysql-connector
-pip install bcrypt
-pip install pyjwt[crypto]

modules/public/home.py

@@ -1,5 +1,5 @@
-from    mako.template		import Template
+from    mako.template      import Template
-import	config.globalvar	as globalvar
+from    config             import globalvar
 
 class main:
 

page/error/403.html

@@ -1 +0,0 @@
-403 Forbidden

page/error/404.html

@@ -1 +0,0 @@
-404 Not found

page/error/500.html

@@ -1 +0,0 @@
-500 Internal server error

scripts/bodyfetcher.py

@@ -1,13 +0,0 @@
-import cherrypy
-import cherrypy_cors
-import json
-
-def body_json():
-    result = None
-    if cherrypy.request.method == 'OPTIONS':
-        cherrypy_cors.preflight(allowed_methods=['GET', 'POST'])
-    if cherrypy.request.method == 'POST':
-        cherrypy.serving.response.headers['Content-Type'] = 'application/json'
-        body_request = cherrypy.request.body.read()
-        result = json.loads(body_request.decode())
-    return result

scripts/loggorilla.py

@@ -1,13 +0,0 @@
-import datetime
-
-def prcss(loc, msg):
-    print(f"[loggorilla][{datetime.datetime.now()}][\033[32mprcss\033[39m][\033[95m{loc}\033[39m] {msg}")
-
-def accss(loc, msg):
-    print(f"[loggorilla][{datetime.datetime.now()}][\033[36maccss\033[39m][\033[95m{loc}\033[39m] {msg}")
-
-def fyinf(loc, msg):
-    print(f"[loggorilla][{datetime.datetime.now()}][\033[93mfyinf\033[39m][\033[95m{loc}\033[39m] {msg}")
-
-def error(loc, msg):
-    print(f"[loggorilla][{datetime.datetime.now()}][\033[31merror\033[39m][\033[95m{loc}\033[39m] {msg}")

scripts/sendwave.py

@@ -1,23 +0,0 @@
-from    email.mime.multipart    import MIMEMultipart
-from    email.mime.text         import MIMEText
-import  smtplib
-
-def smtp(config):
-
-    msg = MIMEMultipart('alternative')
-    msg['Subject'   ] = config['subject'    ]
-    msg['From'      ] = config['from'       ]
-    msg['To'        ] = config['to'         ]
-
-    part1 = MIMEText(config['text'], 'plain')
-    part2 = MIMEText(config['html'], 'html' )
-
-    msg.attach(part1)
-    msg.attach(part2)
-
-    smtp_server = smtplib.SMTP(config['server']['host'], config['server']['port'])
-    smtp_server.ehlo()
-    smtp_server.starttls()
-    smtp_server.login( config['login']['email'], config['login']['password'] )
-    smtp_server.sendmail('&&&&&&', config['to'], msg.as_string() )
-    smtp_server.quit()

scripts/tokenguard.py

@@ -1,23 +0,0 @@
-from cryptography.hazmat.primitives import serialization
-import jwt
-
-def encode(payload, id_rsa, passphrase):
-    private_key = open(id_rsa, 'r').read()
-    key         = serialization.load_ssh_private_key(private_key.encode(), password=passphrase)
-    token       = jwt.encode(
-        payload     = payload,
-        key         = key,
-        algorithm   = 'RS256'
-    )
-    return token
-
-def decode(token, id_rsa):
-    public_key  = open(id_rsa, 'r').read()
-    key         = serialization.load_ssh_public_key(public_key.encode())
-    header      = jwt.get_unverified_header(token)
-    payload     = jwt.decode(
-        jwt         = token,
-        key         = key,
-        algorithms  = [header['alg'], ]
-    )
-    return payload

templates/bare/main.py

@@ -2,18 +2,8 @@ from core   import html
 
 static = [
     {
-        'name':'/bare/lib',
+        "route" :"/bare/lib/<filepath:re:.*\.(css|sass|css.map|js|js.map)>",
-        'value':{
+        "root"  :"./templates/bare/static/lib"
-            'tools.staticdir.on'    : True ,
-            'tools.staticdir.dir'   : './templates/bare/static/lib' ,
-        }
-    },
-    {
-        'name':'/bare/css',
-        'value':{
-            'tools.staticdir.on'    : True ,
-            'tools.staticdir.dir'   : './templates/bare/static/css' ,
-        }
     }
 ]
 
@@ -22,9 +12,9 @@ def main(dir, page):
     html_template   = html.main.get_html("templates/bare/html")
     html_page       = html.main.get_html(dir)
     params_list = {
-        "template"  : html_template ["template.html"    ]   ,
+        "template"  : html_template ["template.html"    ],
-        "topnav"    : html_template ["topnav.html"      ]   ,
+        "topnav"    : html_template ["topnav.html"      ],
-        "footer"    : html_template ["footer.html"      ]   ,
+        "footer"    : html_template ["footer.html"      ],
         "container" : html_page     [ page+".html"      ]
     }
     return params_list

templates/bare/static/css/style.css

@@ -1 +0,0 @@
-/* your style here */