3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

app: include announcements in welcome page context 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-04-03 08:34:35 -04:00
parent 156e9652e1
commit 13bb624bd7
No known key found for this signature in database
GPG Key ID: 7027245FBBDDF59A
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
moonraker/app.py
View File

@ -47,6 +47,7 @@ if TYPE_CHECKING:
from confighelper import ConfigHelper from confighelper import ConfigHelper
from klippy_connection import KlippyConnection as Klippy from klippy_connection import KlippyConnection as Klippy
from components.file_manager.file_manager import FileManager from components.file_manager.file_manager import FileManager
from components.announcements import Announcements
from io import BufferedReader from io import BufferedReader
import components.authorization import components.authorization
MessageDelgate = Optional[tornado.httputil.HTTPMessageDelegate] MessageDelgate = Optional[tornado.httputil.HTTPMessageDelegate]
@ -199,7 +200,8 @@ class MoonrakerApp:
'server': self.server, 'server': self.server,
'default_handler_class': AuthorizedErrorHandler, 'default_handler_class': AuthorizedErrorHandler,
'default_handler_args': {}, 'default_handler_args': {},
'log_function': self.log_request 'log_function': self.log_request,
'compiled_template_cache': False,
} }
# Set up HTTP only requests # Set up HTTP only requests
@ -940,7 +942,7 @@ class WelcomeHandler(tornado.web.RequestHandler):
def initialize(self) -> None: def initialize(self) -> None:
self.server: Server = self.settings['server'] self.server: Server = self.settings['server']
def get(self) -> None: async def get(self) -> None:
summary: List[str] = [] summary: List[str] = []
auth: AuthComp = self.server.lookup_component("authorization", None) auth: AuthComp = self.server.lookup_component("authorization", None)
if auth is not None: if auth is not None:
@ -999,6 +1001,8 @@ class WelcomeHandler(tornado.web.RequestHandler):
"that the klipper service has successfully started and that " "that the klipper service has successfully started and that "
"its unix is enabled." "its unix is enabled."
) )
ancomp: Announcements
ancomp = self.server.lookup_component("announcements")
wsm: WebsocketManager = self.server.lookup_component("websockets") wsm: WebsocketManager = self.server.lookup_component("websockets")
context: Dict[str, Any] = { context: Dict[str, Any] = {
"ip_address": self.request.remote_ip, "ip_address": self.request.remote_ip,
@ -1008,7 +1012,8 @@ class WelcomeHandler(tornado.web.RequestHandler):
"ws_count": wsm.get_count(), "ws_count": wsm.get_count(),
"klippy_state": kstate, "klippy_state": kstate,
"warnings": self.server.get_warnings(), "warnings": self.server.get_warnings(),
"summary": summary "summary": summary,
"announcements": await ancomp.get_announcements()
} }
self.render("welcome.html", **context) self.render("welcome.html", **context)