Merge pull request 'Wif parser, pymongo check' (#1) from wif_parser into main

Reviewed-on: seastorm/treadl#1

api/chalicelib/util/database.py

@@ -6,6 +6,7 @@ db = None
 
 def get_db():
   global db
-  if not db:
+
+  if db is None:
     db = MongoClient(os.environ['MONGO_URL'])[os.environ['MONGO_DATABASE']]
   return db

api/chalicelib/util/wif.py

@@ -129,10 +129,15 @@ def loads(wif_file):
   draft['warp'] = {}
   draft['warp']['shafts'] = weaving.getint('shafts')
   draft['warp']['threading'] = []
-  draft['warp']['defaultColour'] = draft['colours'][warp.getint('color')-1]
+  
+  
+  if warp.get('color'):
     warp_colour_index = warp.getint('color') - 1
+    draft['warp']['defaultColour'] = draft['colours'][warp_colour_index]
+
+  else:
     # In case of no color table or colour index out of bounds
-  draft['warp']['defaultColour'] = draft['colours'][warp_colour_index] if len(draft['colours']) > warp_colour_index else draft['colours'][0]
+    draft['warp']['defaultColour'] = draft['colours'][0]
 
   for x in threading:
     shaft = threading[x]
@@ -155,9 +160,13 @@ def loads(wif_file):
   draft['weft'] = {}
   draft['weft']['treadles'] = weaving.getint('treadles')
   draft['weft']['treadling'] = []
+  
+  if weft.get('color'):
     weft_colour_index = weft.getint('color') - 1
+    draft['weft']['defaultColour'] = draft['colours'][weft_colour_index]
+  else:
     # In case of no color table or colour index out of bounds 
-  draft['weft']['defaultColour'] = draft['colours'][weft_colour_index] if len(draft['colours']) > weft_colour_index else draft['colours'][1]
+    draft['weft']['defaultColour'] = draft['colours'][1]
 
   for x in treadling:
     shaft = treadling[x]