wilw/treadl
wilw/treadl
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Wif parser, pymongo check #1

Merged
wilw merged 1 commits from wif_parser into main 2021-12-08 07:32:16 +00:00
Conversation 1 Commits 1 Files Changed 2 +18 -8
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/chalicelib/util/database.py
View File

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

23
api/chalicelib/util/wif.py
View File

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