# HG changeset patch # User drewp@bigasterisk.com # Date 2022-05-13 08:11:28 # Node ID 175a1cf36796b5dd16fc271c6be72d8ae53208fe # Parent 960a22eed99c80bd6d7ef274f2be4e195a4478d0 vite serves index.html now diff --git a/light9/ascoltami/webapp.py b/light9/ascoltami/webapp.py --- a/light9/ascoltami/webapp.py +++ b/light9/ascoltami/webapp.py @@ -1,17 +1,22 @@ -import json, socket, subprocess, os, logging, time +import json +import logging +import socket +import subprocess +import time +from typing import cast -from cyclone import template -from rdflib import URIRef -import cyclone.web, cyclone.websocket - +import cyclone.web +import cyclone.websocket from cycloneerr import PrettyErrorHandler from light9.metrics import metricsRoute from light9.namespaces import L9 from light9.showconfig import getSongsFromShow, songOnDisk +from rdflib import URIRef from twisted.internet import reactor +from twisted.internet.interfaces import IReactorTime + +log = logging.getLogger() _songUris = {} # locationUri : song -log = logging.getLogger() -loader = template.Loader(os.path.dirname(__file__)) def songLocation(graph, songUri): @@ -24,13 +29,6 @@ def songUri(graph, locationUri): return _songUris[locationUri] -class root(PrettyErrorHandler, cyclone.web.RequestHandler): - - def get(self): - self.set_header("Content-Type", "text/html") - self.write(loader.load('index.html').generate()) - - class config(cyclone.web.RequestHandler): def get(self): @@ -109,7 +107,7 @@ class timeStreamResource(cyclone.websock self.lastSentTime = now if self.transport.connected: - reactor.callLater(.2, self.loop) + cast(IReactorTime, reactor).callLater(.2, self.loop) def connectionLost(self, reason): log.info("bye ws client %r: %s", self, reason) @@ -191,7 +189,6 @@ class goButton(PrettyErrorHandler, cyclo def makeWebApp(app): return cyclone.web.Application(handlers=[ - (r"/", root), (r"/config", config), (r"/time", timeResource), (r"/time/stream", timeStreamResource),