diff --git a/out/static/style.css b/out/static/style.css
index aa9c0e6..cc0dbe8 100644
--- a/out/static/style.css
+++ b/out/static/style.css
@@ -101,7 +101,7 @@ td { padding: 0.2em 1em 0.2em 0.1em; }
.help-links tr:nth-child(even) { background: #DDD; }
.help-links tr:nth-child(odd) { background: #F9F9F9; }
.help-links .notyet { color: #D11; }
-.help-links .done { color: #3AE48C; }
+.help-links .done { color: #52C840; }
/* domain tags */
.tags { margin: 2em 0; }
diff --git a/src/html_bundle.py b/src/html_bundle.py
index 49c1567..00d14ce 100755
--- a/src/html_bundle.py
+++ b/src/html_bundle.py
@@ -90,6 +90,8 @@ def prepare_json(obj):
def transform(ddic):
res = list()
+ c_sum = 0
+ c_trkr = 0
for name, (is_tracker, counts) in ddic.items():
rec_percent = len(counts) / rec_count
if rec_percent < THRESHOLD_PERCENT_OF_LOGS:
@@ -98,21 +100,17 @@ def prepare_json(obj):
if avg < THRESHOLD_MIN_AVG_LOGS:
continue
res.append([name, round(avg + 0.001), is_tracker])
+ c_sum += avg
+ c_trkr += avg if is_tracker else 0
res.sort(key=lambda x: (-x[1], x[0])) # sort by count desc, then name
- return res
+ return res, c_trkr, c_sum
- obj['pardom'] = transform(obj['pardom'])
- obj['subdom'] = transform(obj['subdom'])
- # do this after the transformation:
- c_tracker = 0
- c_total = 0
- for _, c, flag in obj['subdom']:
- c_tracker += c if flag else 0
- c_total += c
- obj['tracker_percent'] = c_tracker / (c_total or 1)
+ obj['pardom'], p_t, p_c = transform(obj['pardom'])
+ obj['subdom'], s_t, s_c = transform(obj['subdom'])
+ obj['tracker_percent'] = s_t / (s_c or 1)
obj['tracker'] = list(filter(lambda x: x[2], obj['subdom']))
- obj['avg_logs'] = c_total
- obj['avg_logs_pm'] = c_total / (obj['avg_time'] or 1) * 60
+ obj['avg_logs'] = s_c
+ obj['avg_logs_pm'] = s_c / (obj['avg_time'] or 1) * 60
def gen_html(bundle_id, obj):
diff --git a/templates/base.html b/templates/base.html
index 712de0e..18804c8 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -3,9 +3,9 @@
-
+
#_TITLE_#AppCheck: Privacy Monitor
-
+