From 61fc851da2c8d025f2474f1d2e6f6f136ebaf15f Mon Sep 17 00:00:00 2001 From: trackingv2 Date: Tue, 26 Oct 2021 18:57:29 +0200 Subject: [PATCH] update source --- plotter2.py | 6 ++++-- trackingv2.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plotter2.py b/plotter2.py index 2c51834..64c6aa1 100644 --- a/plotter2.py +++ b/plotter2.py @@ -13,8 +13,10 @@ with open("/home/trackingv2/trackingv2.csv", "r") as f: writer = csv.writer(write) writer.writerow(["fraction_nonv2", "datetime"]) for row in reader: - per = int(row[1]) / int(row[2]) - per = round(per, 4) + per = 0 + if row[1] != "0" and row[2] != "0": + per = int(row[1]) / int(row[2]) + per = round(per, 4) writer.writerow([per, row[3]]) x_axis='datetime' diff --git a/trackingv2.py b/trackingv2.py index 42f72bb..c5c31dc 100644 --- a/trackingv2.py +++ b/trackingv2.py @@ -31,7 +31,7 @@ while True: if re.search("^s.*HSDir", line1, re.IGNORECASE): line2 = file.readline() numberOfHSDir += 1 - if re.search("^v.*Tor 0.4.[6-9]", line2, re.IGNORECASE): + if re.search("^v.*Tor (0.4.[6-9]|0.3.5.17|0.4.5.11)", line2, re.IGNORECASE): numberOfNonv2 += 1 else: numberOfv2 += 1