diff --git a/app.py b/app.py index dae9c1a..1e412c6 100644 --- a/app.py +++ b/app.py @@ -61,6 +61,19 @@ def datetime_format(value, format='%Y-%m-%d %H:%M:%S'): return time.strftime(format, time.gmtime(value)) +@app.template.filetr("duration_format") +def duration_format(value): + delay = datetime.timedelta(seconds=value) + if (delay.days > 0): + out = str(delay).replace(" days, ", ":") + else: + out = "0:" + str(delay) + outAr = out.split(':') + outAr = ["%02d" % (int(float(x))) for x in outAr] + out = ":".join(outAr) + return out + + @app.template_filter("from_timestamp") def from_timestamp(value): return datetime.datetime.fromtimestamp(value) diff --git a/static/css/main.css b/static/css/main.css index a49b321..27a5439 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -19,6 +19,9 @@ a { .table td { padding: 2px 0; } +.table-numeric td { + text-align: end; +} .bg-application { background: #8FB847; diff --git a/templates/stats.html b/templates/stats.html index 26af6bb..1649c5c 100644 --- a/templates/stats.html +++ b/templates/stats.html @@ -71,7 +71,7 @@
Server | @@ -87,10 +87,10 @@||||||||
---|---|---|---|---|---|---|---|---|
{{ server }} | {{ crawl_server_stats[server].task_count }} | -{{ crawl_server_stats[server].time|round(2) }}s | -{{ crawl_server_stats[server].time_avg|round(2) }}s | +{{ crawl_server_stats[server].time | duration_format() }} | +{{ crawl_server_stats[server].time_avg | duration_format() }} | {{ crawl_server_stats[server].file_count }} | -{{ crawl_server_stats[server].file_count_avg | round(2) }} | +{{ "%.2f" % crawl_server_stats[server].file_count_avg }} |