Update cherrypy

Author: jgujerry

cherrypy-bootstrap/src/cherrypy_bootstrap/application/__init__.py

@@ -1,6 +1,6 @@
 import cherrypy
 
-from utils import render
+from src.cherrypy_bootstrap.utilities import render
 
 
 class CherryApp(object):

cherrypy-bootstrap/src/cherrypy_bootstrap/app.py renamed to cherrypy-bootstrap/src/cherrypy_bootstrap/application/controllers.py

@@ -0,0 +1,33 @@
+import pathlib
+
+import cherrypy
+
+
+path = pathlib.Path(__file__).parent.absolute()
+app_config = {
+  "global" : {
+    "server.socket_host" : "127.0.0.1",
+    "server.socket_port" : 8080,
+    "server.thread_pool" : 8,
+
+    "engine.autoreload.on" : True,
+
+    "tools.trailing_slash.on" : False
+  },
+  "/static" : {
+    "tools.staticdir.on"  : True,
+    "tools.staticdir.dir" : path.joinpath("templates")
+  }
+}
+
+if cherrypy.config.get("environment") == "production":
+  app_config["global"]["engine.autoreload.on"] = False
+  app_config["global"]["server.thread_pool"] = 30
+  app_config["global"]["server.socket_host"] = "0.0.0.0"
+  app_config["global"]["server.socket_port"] = 80
+  app_config["global"]["environment"] = "production"
+  app_config["global"]["log.screen"] = False
+
+else:
+  app_config["global"]["environment"] = "development"
+  app_config['global']['log.screen'] = True

cherrypy-bootstrap/src/cherrypy_bootstrap/application/models.py

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cherryd -P main -c config.py

cherrypy-bootstrap/src/cherrypy_bootstrap/config.py

@@ -1,7 +1,12 @@
 import cherrypy
 
-from app import CherryApp
+from src.cherrypy_bootstrap import config
+from src.cherrypy_bootstrap.application import controllers
 
 
 if __name__ == "__main__":
-    cherrypy.quickstart(CherryApp())
+    cherrypy.tree.mount(
+        controllers.CherryApp(),
+        "/",
+        config=config.app_config
+    )

cherrypy-bootstrap/src/cherrypy_bootstrap/entrypoint.sh

@@ -0,0 +1,5 @@
+{% extends 'base.html' %}
+
+{% block content %}
+<h1>Error has happened</h1>
+{% endblock %}

cherrypy-bootstrap/src/cherrypy_bootstrap/main.py

@@ -1,11 +1,12 @@
 
 {% extends "base.html" %}
 
+{% block content %}
 <header class="hero bg-primary text-white text-center">
     <div class="container">
         <h1>Welcome to CherryPy Bootstrap5 App</h1>
         <p>This is a simple, responsive landing page made with Bootstrap 5.</p>
         <a href="#" class="btn btn-light btn-lg">Learn More</a>
     </div>
 </header>
-{% block content %}
+{% endblock %}