Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-13 22:40:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated the api refresh task to check main_char_id

Browse Source
This commit is contained in:
Raynaldo Rivera 2014-10-16 11:30:37 -07:00
parent 7e71c4607f
commit ecc46629df
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
celerytask/tasks.py
View File

@ -128,23 +128,27 @@ def run_api_refresh():
if api_key_pairs: if api_key_pairs:
valid_key = False valid_key = False
authserviceinfo = AuthServicesInfo.objects.get(user=user) authserviceinfo = AuthServicesInfo.objects.get(user=user)
for api_key_pair in api_key_pairs: # We do a check on the authservice info to insure that we shoud run the check
if EveApiManager.api_key_is_valid(api_key_pair.api_id, api_key_pair.api_key): # No point in running the check on people who arn't on services
# Update characters if authserviceinfo.main_char_id:
characters = EveApiManager.get_characters_from_api(api_key_pair.api_id, api_key_pair.api_key) if authserviceinfo.main_char_id != "":
EveManager.update_characters_from_list(characters) for api_key_pair in api_key_pairs:
valid_key = True if EveApiManager.api_key_is_valid(api_key_pair.api_id, api_key_pair.api_key):
else: # Update characters
EveManager.delete_characters_by_api_id(api_key_pair.api_id, api_key_pair.api_key) characters = EveApiManager.get_characters_from_api(api_key_pair.api_id, api_key_pair.api_key)
EveManager.delete_api_key_pair(api_key_pair.api_id, api_key_pair.api_key) EveManager.update_characters_from_list(characters)
valid_key = True
else:
EveManager.delete_characters_by_api_id(api_key_pair.api_id, api_key_pair.api_key)
EveManager.delete_api_key_pair(api_key_pair.api_id, api_key_pair.api_key)
if valid_key: if valid_key:
# Check our main character # Check our main character
main_alliance_id = EveManager.get_charater_alliance_id_by_id(authserviceinfo.main_char_id) main_alliance_id = EveManager.get_charater_alliance_id_by_id(authserviceinfo.main_char_id)
if main_alliance_id == settings.ALLIANCE_ID: if main_alliance_id == settings.ALLIANCE_ID:
pass pass
else: else:
deactivate_services(user) deactivate_services(user)
else: else:
#nuke it #nuke it
deactivate_services(user) deactivate_services(user)