Goodbye eveapi! You have served us well all these years!

Start stripping XML API stuff and implement ESI skill fetching.
This commit is contained in:
blitzmann
2018-02-08 23:05:01 -05:00
parent cb392e7e5f
commit 33bf5234d0
15 changed files with 93 additions and 1697 deletions

View File

@@ -27,14 +27,12 @@ from eos.effectHandlerHelpers import HandledImplantBoosterList
from eos.saveddata.implant import Implant
from eos.saveddata.user import User
from eos.saveddata.character import Character, Skill
from eos.saveddata.ssocharacter import SsoCharacter
characters_table = Table("characters", saveddata_meta,
Column("ID", Integer, primary_key=True),
Column("name", String, nullable=False),
Column("apiID", Integer),
Column("apiKey", String),
Column("defaultChar", Integer),
Column("chars", String, nullable=True),
Column("ssoCharacterID", ForeignKey("ssoCharacter.ID"), nullable=True),
Column("defaultLevel", Integer, nullable=True),
Column("alphaCloneID", Integer, nullable=True),
Column("ownerID", ForeignKey("users.ID"), nullable=True),
@@ -62,6 +60,6 @@ mapper(Character, characters_table,
single_parent=True,
primaryjoin=charImplants_table.c.charID == characters_table.c.ID,
secondaryjoin=charImplants_table.c.implantID == Implant.ID,
secondary=charImplants_table),
secondary=charImplants_table)
}
)

View File

@@ -479,7 +479,7 @@ def getSsoCharacter(lookfor, clientHash, eager=None):
filter = SsoCharacter.client == clientHash
if isinstance(lookfor, int):
filter = and_(filter, SsoCharacter.characterID == lookfor)
filter = and_(filter, SsoCharacter.ID == lookfor)
elif isinstance(lookfor, str):
filter = and_(filter, SsoCharacter.characterName == lookfor)
else:

View File

@@ -119,12 +119,9 @@ class Character(object):
return all0
def apiUpdateCharSheet(self, skills, secStatus=0):
def clearSkills(self):
del self.__skills[:]
self.__skillIdMap.clear()
for skillRow in skills:
self.addSkill(Skill(self, skillRow["typeID"], skillRow["level"]))
self.secStatus = secStatus
@property
def ro(self):