marcel/survBot
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 1 Wiki Activity

Compare commits

base: marcel:206af05f2606c0178a3702536a3275b1869169a0
Branches Tags
marcel:main
marcel:develop
marcel:feature/docker
marcel:issue/1
marcel:v1.0
..
compare: marcel:a905386ee817c4783052604428dc9344d1092240
Branches Tags
marcel:develop
marcel:feature/docker
marcel:main
marcel:issue/1
marcel:v1.0

2 Commits
206af05f26 ... a905386ee8

Author SHA1 Message Date
Kasper D. Fischer
a905386ee8 [bugfix] fixed html output to produce valid html. 2025-04-03 14:25:03 +02:00
Kasper D. Fischer
a64aeaa5ac [minor] add versioninformation to footer line 2025-04-03 14:23:44 +02:00
2 changed files with 13 additions and 6 deletions
Show Stats Expand all files Collapse all files

5
survBot.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
__version__ = '0.3'
__version__ = '0.3.1'
__author__ = ['Marcel Paffrath <marcel.paffrath@rub.de>', 'Kasper D. Fischer <kasper.fischer@rub.de>']
import os
@ -551,7 +551,8 @@ class SurveillanceBot(object):
def update_status_message(self):
timespan = timedelta(seconds=int(self.parameters.get('timespan') * 24 * 3600))
self.status_message = f'Program starttime (UTC) {self.starttime.strftime("%Y-%m-%d %H:%M:%S")} | ' \
self.status_message = f' Version {__version__} | ' \
f'Program start time (UTC) {self.starttime.strftime("%Y-%m-%d %H:%M:%S")} | ' \
f'Current time (UTC) {UTCDateTime().strftime("%Y-%m-%d %H:%M:%S")} | ' \
f'Refresh period: {self.refresh_period}s | ' \
f'Showing data of last {timespan}'

14
write_utils.py
View File

@ -17,7 +17,7 @@ def get_html_text(text):
def get_html_header(refresh_rate=10):
header = ['<!DOCTYPE html>',
'<html>',
'<html lang="en">',
'<head>',
' <title>SurvBot status</title>',
' <link rel="stylesheet" media="only screen and (max-width: 400px)" href="mobile.css">',
@ -26,7 +26,7 @@ def get_html_header(refresh_rate=10):
' <meta charset="utf-8">',
' <meta name="viewport" content="width=device-width, initial-scale=1">',
'</head>',
'<body>']
'<body>\n']
header = _convert_to_textstring(header)
return header
@ -86,8 +86,14 @@ def get_html_row(items, html_key='td'):
text_str = get_html_link(text, hyperlink) if hyperlink else text
html_class = item.get('html_class')
class_str = f' class="{html_class}"' if html_class else ''
row_string += 2 * default_space + f'<{html_key}{class_str} bgcolor="{color}" title="{tooltip}"' \
+ f'style="color:{font_color}">{text_str}</{html_key}>\n'
row_string += 2 * default_space + f'<{html_key}{class_str} '
row_string += f'title="{tooltip}" ' if tooltip else ''
row_string += 'style="' if color or font_color else ''
row_string += f'background-color: {color};' if color else 'style="'
row_string += ' ' if font_color else ''
row_string += f'color: {font_color};' if font_color else ''
row_string += '" ' if color or font_color else ''
row_string += f'>{text_str}</{html_key}>\n'
row_string += default_space + '</tr>\n'
return row_string