From c4db6130dcf2c78b3b0e05bc98d9a830a51dbfe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Gl=C3=BCpker?= Date: Tue, 16 Feb 2021 17:55:14 +0100 Subject: Change format_datetime to be a Jinja2 filter --- main.py | 5 ++--- templates/lobby_html.jinja | 2 +- templates/premades_html.jinja | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/main.py b/main.py index ae15acf..f5def41 100755 --- a/main.py +++ b/main.py @@ -53,6 +53,8 @@ def display_time(seconds, granularity=2): result.append("{}{}".format(int(value), name)) return ' '.join(result[:granularity]) +app.jinja_env.filters['display_time'] = display_time + def grepSteamids(text): steamids = [] SteamIDfromText = re.findall(r'STEAM_\d:(\d):(\d+)', text) @@ -131,7 +133,6 @@ def lobby(): serverinfo = serverinfo, gamelist = gamelist, states = ['Offline', 'Online', 'Busy', 'Away', 'Snooze', 'Looking to trade', 'Looking to play'], - display_time = display_time, current_time = time.time()) @app.route("/premadefinder", methods=['GET', 'POST']) @@ -166,7 +167,6 @@ def premades(): return render_template('premades_html.jinja', steamids=steamids, profiles=premadedata, - display_time=display_time, current_time = time.time(), connections=connections ) @@ -204,7 +204,6 @@ def server(): return render_template('server_html.jinja', servers=servers, - display_time = display_time ) if __name__ == '__main__': diff --git a/templates/lobby_html.jinja b/templates/lobby_html.jinja index ae0000e..468a2fa 100644 --- a/templates/lobby_html.jinja +++ b/templates/lobby_html.jinja @@ -78,7 +78,7 @@ (non-steam) {% else %} {% if profile['personastate'] == 0 %} - Offline since {{ display_time(current_time - profile['lastlogoff']) }} + Offline since {{ (current_time - profile['lastlogoff']) | display_time }} {% else %} {{ states[profile['personastate']] }} {% endif %} diff --git a/templates/premades_html.jinja b/templates/premades_html.jinja index c9ad464..7a45492 100644 --- a/templates/premades_html.jinja +++ b/templates/premades_html.jinja @@ -138,7 +138,7 @@
{{ profiles[steamid]['personaname']|e }} {% if 'timecreated' in profiles[steamid] %} -
{{ display_time(current_time - profiles[steamid]['timecreated']) }} +
{{ (current_time - profiles[steamid]['timecreated']) | display_time }} {% endif %} -- cgit v1.2.3