From c139886c61b95e93b65faa03691bf2dcda9da7c1 Mon Sep 17 00:00:00 2001
From: relikd <info@relikd.de>
Date: Tue, 15 Sep 2020 20:34:55 +0200
Subject: [PATCH] Fix IP address part of domain

---
 src/bundle_combine.py |  2 ++
 src/html_bundle.py    | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/bundle_combine.py b/src/bundle_combine.py
index ce10cb2..131a9ab 100755
--- a/src/bundle_combine.py
+++ b/src/bundle_combine.py
@@ -23,6 +23,8 @@ def get_parent_domain(subdomain):
     parts = subdomain.split('.')
     if len(parts) < 3:
         return subdomain
+    elif parts[-1].isdigit():
+        return subdomain  # ip address
     elif dom_in_3rd_domain(parts[-1] + '.' + parts[-2]):
         return '.'.join(parts[-3:])
     else:
diff --git a/src/html_bundle.py b/src/html_bundle.py
index dd7de72..dd3247a 100755
--- a/src/html_bundle.py
+++ b/src/html_bundle.py
@@ -14,6 +14,10 @@ def seconds_to_time(seconds):
     return '{:02d}:{:02d}:{:02d}'.format(hours, minutes, seconds)
 
 
+def round_num(num):
+    return format(num, '.1f')  # .rstrip('0').rstrip('.')
+
+
 def gen_dotgraph(sorted_arr):
     txt = ''
     for name, count, mark in sorted_arr:
@@ -94,10 +98,10 @@ def gen_html(bundle_id, obj):
     <tr><td>Number of recordings:</td><td>{ obj['sum_rec'] }</td></tr>
     <tr><td>Total number of requests:</td><td>{
         obj['sum_logs'] }<i class="snd mg_lr">({
-            round(obj['sum_logs_pm'], 1)} / min)</i></td></tr>
+            round_num(obj['sum_logs_pm'])} / min)</i></td></tr>
     <tr><td>Average number of requests:</td><td>{
-        round(obj['avg_logs'], 1)}<i class="snd mg_lr">({
-            round(obj['avg_logs_pm'], 1)} / min)</i></td></tr>
+        round_num(obj['avg_logs'])}<i class="snd mg_lr">({
+            round_num(obj['avg_logs_pm'])} / min)</i></td></tr>
     <tr><td>Average recording time:</td><td>{
         seconds_to_time(obj['avg_time']) }</td></tr>
     <tr><td>Cumulative recording time:</td><td>{