dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Merge branch 'master' of https://github.com/pyfa-org/Pyfa

Browse Source
This commit is contained in:
blitzman
2016-11-20 14:29:18 -05:00
parent 26285cfc95 8806c941a8
commit a0a0ec9b1f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/jsonToSql.py
View File

@@ -126,7 +126,7 @@ def main(db, json_path):
for row in data: for row in data:
typeLines = [] typeLines = []
typeId = row["typeID"] typeId = row["typeID"]
traitData = row["traits_en-us"] traitData = row["traits"]
for skillData in sorted(traitData.get("skills", ()), key=lambda i: i["header"]): for skillData in sorted(traitData.get("skills", ()), key=lambda i: i["header"]):
typeLines.append(convertSection(skillData)) typeLines.append(convertSection(skillData))
if "role" in traitData: if "role" in traitData:

2
scripts/prep_data.py
View File

@@ -82,7 +82,7 @@ if not args.nojson:
"invtypes,mapbulk_marketGroups,phbmetadata,phbtraits,fsdTypeOverrides,"\ "invtypes,mapbulk_marketGroups,phbmetadata,phbtraits,fsdTypeOverrides,"\
"evegroups,evetypes,evecategories,marketProxy()_GetMarketGroups()" "evegroups,evetypes,evecategories,marketProxy()_GetMarketGroups()"
FlowManager(miners, writers).run(list, "multi") FlowManager(miners, writers).run(list, "en-us")
### SQL Convert ### SQL Convert
import jsonToSql import jsonToSql