Merge pull request commaai#377 from ShaneSmiskol/release2

username fix for data collection

selfdrive/df/df_uploader.py

@@ -4,17 +4,20 @@
 import random
 import os
 from common.params import Params
+import selfdrive.kegman_conf as kegman
 
 def upload_data():
   filepath = "/data/openpilot/selfdrive/df/df-data"
   if os.path.isfile(filepath):
+    if kegman.get("uniqueID") is None:
+      kegman.save({"uniqueID": ''.join([random.choice(string.lowercase+string.uppercase+string.digits) for i in range(15)])})
     try:
-      username = ''.join([random.choice(string.lowercase+string.uppercase+string.digits) for i in range(15)])
+      username = kegman.get("uniqueID", ''.join([random.choice(string.lowercase+string.uppercase+string.digits) for i in range(15)]))
       try:
         with open("/data/data/ai.comma.plus.offroad/files/persistStore/persist-auth", "r") as f:
           auth = json.loads(f.read())
         auth = json.loads(auth['commaUser'])
-        if auth:
+        if auth and str(auth['username']) != "":
           username = str(auth['username'])
       except:
         pass

selfdrive/kegman_conf.py

@@ -96,16 +96,13 @@ def save(data):  # allows for writing multiple key/value pairs
     variables_written.append(key)
   conf.update(data)
 
-def get(key="", default=""):  # can specify a default value if key doesn't exist
+def get(key=None, default=None):  # can specify a default value if key doesn't exist
   global thread_counter
-  if key == "":  # get all
+  if key is None:  # get all
     return conf
   else:
     thread_counter = 0
-    if key in conf:
-      return conf[key]
-    else:
-      return None if default == "" else default
+    return conf[key] if key in conf else default
 
 thread_counter = 0  # don't change
 thread_timeout = 5.0  # minutes to wait before stopping thread. reading or writing will reset the counter