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

Cleanup the char import, avoid hitting the API with corp keys

Browse Source
This commit is contained in:
Andrew Williams
2011-09-28 10:57:08 +01:00
parent 982960e7df
commit 2f4ba7ab76
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,12 +117,20 @@ def import_eve_character_func(character_id, key_id=None, logger=logging.getLogge
else: else:
acc = None acc = None
# Actual Key? Get further information
# If we have a key, check if we should import the charsheet
if acc: if acc:
if gargoyle.is_active('eve-cak'):
if (acc.is_cak and acc.has_access(3) and not acc.api_keytype == API_KEYTYPE_CORPORATION) or not acc.is_cak:
process_charsheet = True
else:
process_charsheet = False
else:
process_charsheet = True
# Actual Key? Get further information
if acc and process_charsheet:
if gargoyle.is_active('eve-cak') and acc.is_cak: if gargoyle.is_active('eve-cak') and acc.is_cak:
if not acc.has_access(3):
logger.error('Key %s does not have access to CharacterSheet' % acc.pk)
return
auth_params = {'keyid': acc.api_user_id, 'vcode': acc.api_key, 'characterid': character_id } auth_params = {'keyid': acc.api_user_id, 'vcode': acc.api_key, 'characterid': character_id }
else: else:
auth_params = {'userID': acc.api_user_id, 'apiKey': acc.api_key, 'characterID': character_id } auth_params = {'userID': acc.api_user_id, 'apiKey': acc.api_key, 'characterID': character_id }