nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-14 23:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better API handling, avoid hitting the character API with NPC corps

Browse Source
This commit is contained in:
Andrew Williams
2012-02-03 00:14:06 +00:00
parent 85c36b6829
commit a9ed7d97f2
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/eve_api/api_exceptions.py
View File

@@ -20,5 +20,8 @@ class APIAccessException(Exception):
Raised on Access errors of any kind, network and EVE API failures Raised on Access errors of any kind, network and EVE API failures
""" """
def __init__(self, msg):
self.msg = msg
def __str__(self): def __str__(self):
return "An error was encountered while accessing the EVE API." return "An error was encountered while accessing the EVE API: %s" % self.msg

2
app/eve_api/tasks/character.py
View File

@@ -65,7 +65,7 @@ def import_eve_character_func(character_id, key_id=None, logger=logging.getLogge
char_doc = CachedDocument.objects.api_query('/eve/CharacterInfo.xml.aspx', params={'characterID': character_id}, no_cache=False) char_doc = CachedDocument.objects.api_query('/eve/CharacterInfo.xml.aspx', params={'characterID': character_id}, no_cache=False)
except DocumentRetrievalError, exc: except DocumentRetrievalError, exc:
logger.error('Error retrieving CharacterInfo.xml.aspx for Character ID %s - %s' % (character_id, exc)) logger.error('Error retrieving CharacterInfo.xml.aspx for Character ID %s - %s' % (character_id, exc))
raise APIAccessException raise APIAccessException(exc.value)
d = basic_xml_parse_doc(char_doc)['eveapi'] d = basic_xml_parse_doc(char_doc)['eveapi']
if 'error' in d: if 'error' in d:

3
app/eve_api/tasks/corporation.py
View File

@@ -98,7 +98,8 @@ def import_corp_details_func(corp_id, log=logging.getLogger(__name__)):
if int(d['allianceID']): if int(d['allianceID']):
corpobj.alliance, created = EVEPlayerAlliance.objects.get_or_create(id=d['allianceID']) corpobj.alliance, created = EVEPlayerAlliance.objects.get_or_create(id=d['allianceID'])
if int(d['ceoID']) > 1: # Skip looking up the CEOs for NPC corps and ones with no CEO defined (dead corps)
if corp_id > 1000182 int(d['ceoID']) > 1:
import_eve_character.delay(d['ceoID'], callback=link_ceo.subtask(corporation=corpobj.id)) import_eve_character.delay(d['ceoID'], callback=link_ceo.subtask(corporation=corpobj.id))
else: else:
corpobj.ceo_character = None corpobj.ceo_character = None