[tor-commits] [onionperf/master] Update analysis results file version to 2.0.

[karsten@xxxxxxxxxxxxxx]

commit d3dfb5b2deccb4ff057f89a5c209050e2c69c1dc
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Thu May 14 21:40:20 2020 +0200

    Update analysis results file version to 2.0.
    
    Implements #34224.
---
 README_JSON.md        | 4 +++-
 onionperf/analysis.py | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/README_JSON.md b/README_JSON.md
index d057bb1..f0ad281 100644
--- a/README_JSON.md
+++ b/README_JSON.md
@@ -207,5 +207,7 @@ The structure is given here with variable keys marked as such.
             }
           }
         }
-      }
+      },
+      "type": "onionperf", # document type
+      "version": "2.0" # document version
     }
diff --git a/onionperf/analysis.py b/onionperf/analysis.py
index 83f993d..a380027 100644
--- a/onionperf/analysis.py
+++ b/onionperf/analysis.py
@@ -37,7 +37,7 @@ class Analysis(object):
         self.nickname = nickname
         self.measurement_ip = ip_address
         self.hostname = gethostname().split('.')[0]
-        self.json_db = {'type':'onionperf', 'version':1.0, 'data':{}}
+        self.json_db = {'type':'onionperf', 'version':'2.0', 'data':{}}
         self.tgen_filepaths = []
         self.torctl_filepaths = []
         self.date_filter = None
@@ -102,7 +102,7 @@ class Analysis(object):
             else:
                 self.json_db['data'][nickname] = analysis.json_db['data'][nickname]
 
-    def save(self, filename=None, output_prefix=os.getcwd(), do_compress=True, version=1.0):
+    def save(self, filename=None, output_prefix=os.getcwd(), do_compress=True):
         if filename is None:
             if self.date_filter is None:
                 filename = "onionperf.analysis.json.xz"
@@ -122,7 +122,7 @@ class Analysis(object):
         logging.info("done!")
 
     @classmethod
-    def load(cls, filename="onionperf.analysis.json.xz", input_prefix=os.getcwd(), version=1.0):
+    def load(cls, filename="onionperf.analysis.json.xz", input_prefix=os.getcwd()):
         filepath = os.path.abspath(os.path.expanduser("{0}".format(filename)))
         if not os.path.exists(filepath):
             filepath = os.path.abspath(os.path.expanduser("{0}/{1}".format(input_prefix, filename)))
@@ -142,7 +142,7 @@ class Analysis(object):
         if 'type' not in db or 'version' not in db:
             logging.warning("'type' or 'version' not present in database")
             return None
-        elif db['type'] != 'onionperf' or db['version'] != 1.0:
+        elif db['type'] != 'onionperf' or str(db['version']) >= '3.':
             logging.warning("type or version not supported (type={0}, version={1})".format(db['type'], db['version']))
             return None
         else:

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits