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

Support evemon character imports.

Browse Source
This commit is contained in:
blitzmann
2015-07-11 01:31:18 -04:00
parent b8f73a7c94
commit 0060f58e3d
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
eos/saveddata/character.py
View File

@@ -105,10 +105,11 @@ class Character(object):
for skill in self.__skills:
self.__skillIdMap[skill.itemID] = skill
def apiUpdateCharSheet(self, sheet):
def apiUpdateCharSheet(self, skills):
del self.__skills[:]
self.__skillIdMap.clear()
for skillRow in sheet.skills:
for skillRow in skills:
self.addSkill(Skill(skillRow["typeID"], skillRow["level"]))
@property

31
service/character.py
View File

@@ -45,13 +45,34 @@ class CharacterImportThread(threading.Thread):
sCharacter = Character.getInstance()
for path in paths:
try:
# we try to parse api XML data first
with open(path, mode='r') as charFile:
sheet = service.ParseXML(charFile)
charID = sCharacter.new()
sCharacter.rename(charID, sheet.name+" (imported)")
sCharacter.apiUpdateCharSheet(charID, sheet)
sCharacter.apiUpdateCharSheet(charID, sheet.skills)
except:
continue
# if it's not api XML data, try this
# this is a horrible logic flow, but whatever
try:
charFile = open(path, mode='r').read()
doc = minidom.parseString(charFile)
if doc.documentElement.tagName != "SerializableCCPCharacter":
raise RuntimeError("Incorrect EVEMon XML sheet")
name = doc.getElementsByTagName("name")[0].firstChild.nodeValue
skill_els = doc.getElementsByTagName("skill")
skills = []
for skill in skill_els:
skills.append({
"typeID": int(skill.getAttribute("typeID")),
"level": int(skill.getAttribute("level")),
})
charID = sCharacter.new()
sCharacter.rename(charID, name+" (EVEMon)")
sCharacter.apiUpdateCharSheet(charID, skills)
except:
continue
wx.CallAfter(self.callback)
class SkillBackupThread(threading.Thread):
@@ -269,12 +290,12 @@ class Character(object):
sheet = auth.character(charID).CharacterSheet()
dbChar.apiUpdateCharSheet(sheet)
dbChar.apiUpdateCharSheet(sheet.skills)
eos.db.commit()
def apiUpdateCharSheet(self, charID, sheet):
def apiUpdateCharSheet(self, charID, skills):
char = eos.db.getCharacter(charID)
char.apiUpdateCharSheet(sheet)
char.apiUpdateCharSheet(skills)
eos.db.commit()
def changeLevel(self, charID, skillID, level):