From 873ab3b6a26779061fd218fb10874fe58b90c899 Mon Sep 17 00:00:00 2001 From: Brendan Howell Date: Sun, 10 May 2020 21:07:05 +0200 Subject: [PATCH] log viewer for web debugging --- screenless/bureau/ihr/ihrweb.py | 19 ++++++++++++++++++- screenless/bureau/ihr/web_logview.html | 24 ++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 screenless/bureau/ihr/web_logview.html diff --git a/screenless/bureau/ihr/ihrweb.py b/screenless/bureau/ihr/ihrweb.py index 7adbf57..cd65ff2 100644 --- a/screenless/bureau/ihr/ihrweb.py +++ b/screenless/bureau/ihr/ihrweb.py @@ -14,6 +14,7 @@ class IhrApp(Bottle): self.route("/", callback=self.index) self.route("/config/", callback=self.bureau_config) self.route("/config/", callback=self.bureau_config, method="POST") + self.route("/log/", callback=self.bureau_log) self.route('/static/', callback=self.static) self.bureaus = [] mpath = inspect.getfile(self.__class__) @@ -25,11 +26,14 @@ class IhrApp(Bottle): templfile = os.path.join(self.tdir, "web_index.html") out = """

The Screenless Office

-

Config Manager

+

Web Manager

    """ for bureau in self.bureaus: + out += '
  • {0}\n'.format(bureau) out += '
  • {0}
    • \n'.format(bureau) + out += '
  • {0}
    • \n'.format(bureau) + out += '' out += '
  • Printers
    • \n' out += '
  • Management
    • \n' @@ -68,6 +72,19 @@ class IhrApp(Bottle): cfgdata = cfg.read() return template.render_unicode(msg=msg, bureau=bureau, cfgfile=cfgfile, mode=mode, cfgdata=cfgdata) + def bureau_log(self, bureau): + # display the current log file for a bureau + msg = "" + templfile = os.path.join(self.tdir, "web_logview.html") + template = mako.template.Template(filename=templfile, input_encoding='utf-8') + + basedir = os.path.expanduser("~/.screenless") + logfile = os.path.join(basedir, cfgfile) + with open(logfile) as log: + logdata = log.read() + + return template.render_unicode(msg=msg, bureau=bureau, logdata=logdata) + def register_bureau(self, bureau): self.bureaus.append(bureau) diff --git a/screenless/bureau/ihr/web_logview.html b/screenless/bureau/ihr/web_logview.html new file mode 100644 index 0000000..ff7b63d --- /dev/null +++ b/screenless/bureau/ihr/web_logview.html @@ -0,0 +1,24 @@ + + + + Screenless Office - log for ${bureau} + + + +

    The Screenless Office

    +

    edit config file ${cfgfile}

    + +
    ${logdata}
    + + + +