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

Removed in-model functions for corp updates, switch to tasks. Cleaned up and improved API tasks

Browse Source
This commit is contained in:
Andrew Williams
2010-12-02 12:57:49 +00:00
parent 4e9dd81ea9
commit 20f4465d68
5 changed files with 241 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
eve_api/tasks/alliance.py
View File

@@ -6,8 +6,8 @@ from celery.decorators import task
from eve_proxy.models import CachedDocument
from eve_api.models import EVEAccount, EVEPlayerCorporation, EVEPlayerAlliance
from eve_api.utils import basic_xml_parse
from eve_api.tasks.corporation import import_corp_details
from eve_api.utils import basic_xml_parse_doc
from eve_api.tasks.corporation import import_corp_details, import_corp_details_result
@task(ignore_result=True)
@@ -18,16 +18,16 @@ def import_alliance_details():
"""
doc = CachedDocument.objects.api_query('/eve/AllianceList.xml.aspx')
dom = minidom.parseString(doc.body.encode('utf-8'))
nodes = dom.getElementsByTagName('result')[0].childNodes
for alliance in basic_xml_parse(nodes)['alliances']:
print alliance
for alliance in basic_xml_parse_doc(doc)['eveapi']['result']['alliances']:
allobj, created = EVEPlayerAlliance.objects.get_or_create(pk=alliance['allianceID'])
if created:
allobj.name = alliance['name']
allobj.ticker = alliance['shortName']
allobj.date_founded = alliance['startDate']
allobj.executor, created = EVEPlayerCorporation.objects.get_or_create(id=alliance['executorCorpID'])
if created:
import_corp_details.delay(alliance['executorCorpID'])
allobj.member_count = alliance['memberCount']
allobj.api_last_updated = datetime.utcnow()
allobj.save()
@@ -36,10 +36,11 @@ def import_alliance_details():
validcorps = []
for corp in alliance['memberCorporations']:
if corp.id not in corplist:
if int(corp['corporationID']) not in corplist:
corpobj, created = EVEPlayerCorporation.objects.get_or_create(pk=corp['corporationID'])
corpobj.alliance = allobj
corpobj.save()
if created:
import_corp_details.delay(corp['corporationID'])
validcorps.append(int(corp['corporationID']))