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

Merge pull request #1188 from pyfa-org/bug/evemon-char

Browse Source 
EVEMon import fix
This commit is contained in:
Ryan Holmes
2017-05-22 00:41:12 -04:00
committed by GitHub
parent 18554e3186 5a60cff9a1
commit 218712835e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eos/saveddata/character.py
View File

@@ -119,7 +119,7 @@ class Character(object):
return all0
def apiUpdateCharSheet(self, skills, secStatus):
def apiUpdateCharSheet(self, skills, secStatus=0):
del self.__skills[:]
self.__skillIdMap.clear()
for skillRow in skills:

7
service/character.py
View File

@@ -77,6 +77,7 @@ class CharacterImportThread(threading.Thread):
pyfalog.error("Incorrect EVEMon XML sheet")
raise RuntimeError("Incorrect EVEMon XML sheet")
name = doc.getElementsByTagName("name")[0].firstChild.nodeValue
securitystatus = doc.getElementsByTagName("securityStatus")[0].firstChild.nodeValue or 0
skill_els = doc.getElementsByTagName("skill")
skills = []
for skill in skill_els:
@@ -93,7 +94,7 @@ class CharacterImportThread(threading.Thread):
skill.getAttribute("level"),
)
char = sCharacter.new(name + " (EVEMon)")
sCharacter.apiUpdateCharSheet(char.ID, skills)
sCharacter.apiUpdateCharSheet(char.ID, skills, securitystatus)
except Exception, e:
pyfalog.error("Exception on character import:")
pyfalog.error(e)
@@ -378,9 +379,9 @@ class Character(object):
wx.CallAfter(guiCallback, e)
@staticmethod
def apiUpdateCharSheet(charID, skills):
def apiUpdateCharSheet(charID, skills, securitystatus):
char = eos.db.getCharacter(charID)
char.apiUpdateCharSheet(skills)
char.apiUpdateCharSheet(skills, securitystatus)
eos.db.commit()
@staticmethod