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

More tweaks to dynamically generate the columns, and a fix for attribute display names

Browse Source
This commit is contained in:
blitzmann
2020-06-25 00:40:29 -04:00
parent 8be4b0dd91
commit 66140f092b
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
db_update.py
View File

@@ -156,7 +156,8 @@ def update_db():
def processEveGroups():
print('processing evegroups')
data = _readData('fsd_lite', 'evegroups', keyIdName='groupID')
_addRows(data, eos.gamedata.Group, fieldMap={'groupName_en-us': 'groupName'})
map = {'groupName_en-us': 'groupName'}
_addRows(data, eos.gamedata.Group, fieldMap=map)
return data
def processEveCategories():
@@ -169,10 +170,11 @@ def update_db():
def processDogmaAttributes():
print('processing dogmaattributes')
data = _readData('fsd_binary', 'dogmaattributes', keyIdName='attributeID')
_addRows(data, eos.gamedata.AttributeInfo, fieldMap={
map = {
'displayName_en-us': 'displayName',
'tooltipDescription_en-us': 'tooltipDescription'
})
}
_addRows(data, eos.gamedata.AttributeInfo, fieldMap=map)
def processDogmaTypeAttributes(eveTypesData):
print('processing dogmatypeattributes')

7
eos/db/gamedata/attribute.py
View File

@@ -23,7 +23,7 @@ from sqlalchemy.orm import relation, mapper, synonym, deferred
from eos.db import gamedata_meta
from eos.gamedata import Attribute, AttributeInfo, Unit
import eos.config
typeattributes_table = Table("dgmtypeattribs", gamedata_meta,
Column("value", Float),
Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True, index=True),
@@ -36,8 +36,7 @@ attributes_table = Table("dgmattribs", gamedata_meta,
Column("maxAttributeID", Integer, ForeignKey("dgmattribs.attributeID")),
Column("description", Unicode),
Column("published", Boolean),
Column("displayName", String),
Column("displayName_zh", String),
*[Column("displayName{}".format(lang), String) for lang in eos.config.translation_mapping.values()],
Column("highIsGood", Boolean),
Column("iconID", Integer),
Column("attributeCategory", Integer),
@@ -59,7 +58,7 @@ Attribute.ID = association_proxy("info", "attributeID")
Attribute.name = association_proxy("info", "attributeName")
Attribute.description = association_proxy("info", "description")
Attribute.published = association_proxy("info", "published")
Attribute.displayName = association_proxy("info", "displayName")
Attribute.displayName = association_proxy("info", "displayName{}".format(eos.config.lang)) # todo: this will probably have to be updated... maybe?
Attribute.highIsGood = association_proxy("info", "highIsGood")
Attribute.iconID = association_proxy("info", "iconID")
Attribute.icon = association_proxy("info", "icon")

3
eos/db/gamedata/group.py
View File

@@ -26,8 +26,7 @@ import eos.config
groups_table = Table("invgroups", gamedata_meta,
Column("groupID", Integer, primary_key=True),
Column("groupName", String),
Column("groupName_zh", String),
*[Column("groupName{}".format(lang), String) for lang in eos.config.translation_mapping.values()],
Column("description", String), # deprecated
Column("published", Boolean),
Column("categoryID", Integer, ForeignKey("invcategories.categoryID")),