diff --git a/out/static/style.css b/out/static/style.css index 9ff7910..41afa4e 100644 --- a/out/static/style.css +++ b/out/static/style.css @@ -109,19 +109,14 @@ td { padding: 0.2em 1em 0.2em 0.1em; } font-size: 0.9em; font-style: normal; font-weight: normal; - background: lightgray; + background: #eee; padding: 2pt 4pt; border: 1pt solid #aaa; border-radius: 0.2em; display: inline-block; margin: 0.12em; } -.tags i.trckr:before, .tags.trckr i:before, p.trckr:before { - content: '* '; - color: red; - font-weight: bold; -} -.tags i.trckr, .tags.trckr i { background: #DBB; border-color: #C88; } +.tags i.trckr, .tags.trckr i { background: #F99; border-color: #C66; } p.trckr { font-size: 0.9em; margin-left: 0.5em; } /* graphs */ diff --git a/src/html_bundle.py b/src/html_bundle.py index d2fe205..00064c8 100755 --- a/src/html_bundle.py +++ b/src/html_bundle.py @@ -10,6 +10,7 @@ THRESHOLD_MIN_AVG_LOGS = 1.0 # at least x times in total (after %-thresh) def seconds_to_time(seconds): + seconds = int(seconds) minutes, seconds = divmod(seconds, 60) hours, minutes = divmod(minutes, 60) return '{:02d}:{:02d}:{:02d}'.format(hours, minutes, seconds) @@ -71,7 +72,7 @@ def gen_dom_tags(sorted_arr, onlyTrackers=False): txt += '{} '.format(clss, title) anyMark |= mark if txt: - note = '

known tracker

' + note = '

* Potential trackers are highlighted

' return '
{}{}
'.format( 'trckr ' if onlyTrackers else '', txt, note if anyMark else '') else: @@ -133,21 +134,21 @@ def gen_html(bundle_id, obj): time.strftime('%Y-%m-%d, %H:%M', time.gmtime(obj['last_date'])) } Number of recordings:{ obj['sum_rec'] } - Total number of logs:{ + Total number of requests:{ obj['sum_logs'] }({ round(obj['sum_logs_pm'], 1)} / min) - Average number of logs:{ + Average number of requests:{ obj['avg_logs'] }({ round(obj['avg_logs_pm'], 1)} / min) Average recording time:{ - round(obj['avg_time'], 1) } sec + seconds_to_time(obj['avg_time']) } Cumulative recording time:{ seconds_to_time(obj['sum_time']) }

Connections

-

Known Trackers ({ len(obj['tracker']) }):

+

Potential Trackers ({ len(obj['tracker']) }):

{ gen_dom_tags(obj['tracker'], onlyTrackers=True) }

diff --git a/src/main.py b/src/main.py index d19d36c..cc70943 100755 --- a/src/main.py +++ b/src/main.py @@ -82,7 +82,10 @@ def import_update(): if len(then_delete) > 0: print('cleanup _in folder ...') for x in then_delete: - os.remove(fname) + try: + os.remove(fname) + except FileNotFoundError: + pass print('') diff --git a/templates/base.html b/templates/base.html index bc085a5..aadd1f5 100644 --- a/templates/base.html +++ b/templates/base.html @@ -3,9 +3,9 @@ - + #_TITLE_#AppCheck: Privacy Monitor - +