From dcb058a718ada4e1539fb6b198654a0ce30cf7c0 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Mon, 13 Apr 2020 12:52:02 +0300 Subject: [PATCH] Update existing character if character with the same name exists --- gui/esiFittings.py | 9 ++++----- service/character.py | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/gui/esiFittings.py b/gui/esiFittings.py index a8f38fbe5..c773d0afb 100644 --- a/gui/esiFittings.py +++ b/gui/esiFittings.py @@ -362,14 +362,13 @@ class SsoCharacterMgmt(AuxiliaryFrame): def ssoLogin(self, event): self.popCharList() - - characterID = event.character.ID - sChar = Character.getInstance() - char = sChar.new(event.character.characterName) + # Update existing pyfa character, if it doesn't exist - create new + char = sChar.getCharacter(event.character.characterName) + if char is None: + char = sChar.new(event.character.characterName) char.setSsoCharacter(event.character, config.getClientSecret()) sChar.apiFetch(char.ID, APIView.fetchCallback) - event.Skip() def kbEvent(self, event): diff --git a/service/character.py b/service/character.py index 93434ae9a..c5f889e6a 100644 --- a/service/character.py +++ b/service/character.py @@ -242,8 +242,8 @@ class Character: return eos.db.getCharacterList() @staticmethod - def getCharacter(charID): - char = eos.db.getCharacter(charID) + def getCharacter(identity): + char = eos.db.getCharacter(identity) return char def saveCharacter(self, charID):