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

Abstracted standing level (corp or alliance) depending on toggle

Browse Source
This commit is contained in:
Adarnof 2015-09-20 04:19:30 +00:00
parent 2c98b5e4a6
commit 5853b41e58
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
celerytask/tasks.py
View File

@ -292,11 +292,18 @@ def run_corp_update():
EveManager.create_corporation_info(corpinfo['id'], corpinfo['name'], corpinfo['ticker'], EveManager.create_corporation_info(corpinfo['id'], corpinfo['name'], corpinfo['ticker'],
corpinfo['members']['current'], False, None) corpinfo['members']['current'], False, None)
#determine what level of standings to check
#refer to https://github.com/eve-val/evelink/blob/master/evelink/parsing/contact_list.py#L43
standing_level = 'alliance'
if settings.IS_CORP:
standing_level = 'corp'
# Create the corps in the standings # Create the corps in the standings
corp_standings = EveApiManager.get_corp_standings() corp_standings = EveApiManager.get_corp_standings()
if corp_standings: if corp_standings:
for standing_id in EveApiManager.get_corp_standings()['alliance']: for standing_id in EveApiManager.get_corp_standings()[standing_level]:
if int(corp_standings['alliance'][standing_id]['standing']) >= settings.BLUE_STANDING: if int(corp_standings[standing_level][standing_id]['standing']) >= settings.BLUE_STANDING:
if EveApiManager.check_if_id_is_character(standing_id): if EveApiManager.check_if_id_is_character(standing_id):
pass pass
elif EveApiManager.check_if_id_is_corp(standing_id): elif EveApiManager.check_if_id_is_corp(standing_id):
@ -326,9 +333,9 @@ def run_corp_update():
# Update all allinace info's # Update all allinace info's
for all_alliance_info in EveManager.get_all_alliance_info(): for all_alliance_info in EveManager.get_all_alliance_info():
all_alliance_api_info = EveApiManager.get_alliance_information(all_alliance_info.alliance_id) all_alliance_api_info = EveApiManager.get_alliance_information(all_alliance_info.alliance_id)
if 'alliance' in corp_standings: if standing_level in corp_standings:
if int(all_alliance_info.alliance_id) in corp_standings['alliance']: if int(all_alliance_info.alliance_id) in corp_standings[standing_level]:
if int(corp_standings['alliance'][int(all_alliance_info.alliance_id)][ if int(corp_standings[standing_level][int(all_alliance_info.alliance_id)][
'standing']) >= settings.BLUE_STANDING: 'standing']) >= settings.BLUE_STANDING:
EveManager.update_alliance_info(all_alliance_api_info['id'], EveManager.update_alliance_info(all_alliance_api_info['id'],
all_alliance_api_info['executor_id'], all_alliance_api_info['executor_id'],
@ -355,8 +362,8 @@ def run_corp_update():
if alliance is not None and all_corp_info.alliance is not None: if alliance is not None and all_corp_info.alliance is not None:
if int(alliance.alliance_id) in corp_standings['alliance']: if int(alliance.alliance_id) in corp_standings[standing_level]:
if int(corp_standings['alliance'][int(alliance.alliance_id)][ if int(corp_standings[standing_level][int(alliance.alliance_id)][
'standing']) >= settings.BLUE_STANDING: 'standing']) >= settings.BLUE_STANDING:
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance,
True) True)
@ -367,8 +374,8 @@ def run_corp_update():
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance,
False) False)
else: else:
if int(all_corp_info.corporation_id) in corp_standings['alliance']: if int(all_corp_info.corporation_id) in corp_standings[standing_level]:
if int(corp_standings['alliance'][int(all_corp_info.corporation_id)][ if int(corp_standings[standing_level][int(all_corp_info.corporation_id)][
'standing']) >= settings.BLUE_STANDING: 'standing']) >= settings.BLUE_STANDING:
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, True) EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, True)
else: else: