required in file saving/loading

1 files changed, 7 insertions, 5 deletions

diff --git a/dashboard_website/db.py b/dashboard_website/db.py
index f49732e..86001a1 100644
--- a/dashboard_website/db.py
+++ b/dashboard_website/db.py
@@ -194,12 +194,12 @@ def getCluesJSON(timestamp):
     return False
 
 
-def addClue(clue_name, clue_info, longitude, latitude, status="UNVISITED"):
+def addClue(clue_name, clue_info, longitude, latitude, status="UNVISITED", required=False):
     global clues_last_changed, route_update_required, _clues_changed
     for clue in clues:
         if clue.name == clue_name:
             return -1 # clue already exists
-    newClue = Clue(latitude, longitude, clue_name, clue_info, status)
+    newClue = Clue(latitude, longitude, clue_name, clue_info, status, required)
     clues.append(newClue)
     clues_last_changed = time.time()
     route_update_required = True
@@ -323,7 +323,7 @@ def load(filename=None):
                 status = row[4]
                 reqd = True if (row[5] == "True") else False
 
-                clues.append(Clue(latitude, longitude, name, info, status, required=reqd))
+                addClue(name, info, longitude, latitude, "UNVISITED", required=reqd)
             except:
                 return 1
     clues_last_changed = time.time()
@@ -346,12 +346,14 @@ def loadDirty(filename=None):
                 name = row[0]
                 info = row[2]
                 latlong = row[3].split(",")
+                reqd = True if (row[4] == "True") else False
                 if len(latlong) != 2: continue
                 latitude = float(latlong[0])
                 longitude = float(latlong[1])
 
-                clues.append(Clue(latitude, longitude, name, info, "UNVISITED"))
-            except:
+                addClue(name, info, longitude, latitude, "UNVISITED", required=reqd)
+            except Exception as e:
+                print(e)
                 return 1
     clues_last_changed = time.time()
     route_update_required = True