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

eve_api/tasks/alliance.py

@@ -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']))

eve_api/tasks/character.py

@@ -7,12 +7,11 @@ from eve_proxy.models import CachedDocument
 
 from eve_api.models import EVEPlayerCorporation, EVEPlayerCharacter, EVEPlayerCharacterRole
 from eve_api.app_defines import *
-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, basic_xml_parse_doc
 
 
 @task()
-def import_eve_character(character_id, api_key=None, user_id=None):
+def import_eve_character(character_id, api_key=None, user_id=None, callback=None):
     """ 
     Imports a character from the API, providing a API key will populate 
     further details
@@ -23,10 +22,10 @@ def import_eve_character(character_id, api_key=None, user_id=None):
                                                params={'characterID': character_id},
                                                no_cache=False)
 
-    dom = minidom.parseString(char_doc.body.encode('utf-8'))
-    if dom.getElementsByTagName('error'):
+    d = basic_xml_parse_doc(char_doc)['eveapi']
+    if 'error' in d:
         return
-    values = basic_xml_parse(dom.getElementsByTagName('result')[0].childNodes)
+    values = d['result']
     pchar, created = EVEPlayerCharacter.objects.get_or_create(id=character_id)
 
     pchar.name = values['characterName']
@@ -34,6 +33,7 @@ def import_eve_character(character_id, api_key=None, user_id=None):
 
     corp, created = EVEPlayerCorporation.objects.get_or_create(id=values['corporationID'])
     if created:
+        from eve_api.tasks.corporation import import_corp_details
         import_corp_details.delay(values['corporationID'])
     pchar.corporation = corp
     pchar.corporation_date = values['corporationDate']
@@ -85,4 +85,7 @@ def import_eve_character(character_id, api_key=None, user_id=None):
     pchar.api_last_updated = datetime.utcnow()
     pchar.save()
 
-    return pchar
+    if callback:
+        callback.delay(character=pchar.id)
+    else:
+        return pchar

eve_api/tasks/corporation.py

@@ -3,18 +3,65 @@ from xml.dom import minidom
 
 from celery.decorators import task
 from eve_proxy.models import CachedDocument
-from eve_api.models import EVEPlayerCorporation
-from eve_api.api_puller.corp_management import pull_corp_members
-from eve_api.utils import basic_xml_parse
-
+from eve_api.models import EVEPlayerCorporation, EVEPlayerCharacter
+from eve_api.utils import basic_xml_parse_doc
+from eve_api.tasks.character import import_eve_character
         
 @task(ignore_result=True)
 def import_corp_details(corp_id):
-    corp, created = EVEPlayerCorporation.objects.get_or_create(id=corp_id)
+    import_corp_details_func(corp_id)
+
+@task()
+def import_corp_details_result(corp_id):
+    return import_corp_details_func(corp_id)
+
+
+def import_corp_details_func(corp_id):
+    corpobj, created = EVEPlayerCorporation.objects.get_or_create(id=corp_id)
     
-    if created or not corp.api_last_updated or corp.api_last_updated < (datetime.utcnow() - timedelta(hours=12)):
-        corp.query_and_update_corp()
-        corp.save()
+    if created or not corpobj.api_last_updated or corpobj.api_last_updated < (datetime.utcnow() - timedelta(hours=12)):
+
+        doc = CachedDocument.objects.api_query('/corp/CorporationSheet.xml.aspx', {'corporationID': corp_id})
+        d = basic_xml_parse_doc(doc)['eveapi']['result']
+
+        tag_mappings = (
+            ('corporationName', 'name'),
+            ('ticker', 'ticker'),
+            ('url', 'url'),
+            ('description', 'description'),
+            ('memberCount', 'member_count'),
+        )
+
+        for tag_map in tag_mappings:
+            setattr(corpobj, tag_map[1], d[tag_map[0]])
+
+        logo_mappings = (
+            ('graphicID', 'logo_graphic_id'),
+            ('shape1', 'logo_shape1'),
+            ('shape2', 'logo_shape2'),
+            ('shape3', 'logo_shape3'),
+            ('color1', 'logo_color1'),
+            ('color2', 'logo_color2'),
+            ('color3', 'logo_color3'),
+        )
+
+        for logo_map in logo_mappings:
+            setattr(corpobj, logo_map[1], d['logo'][logo_map[0]])
+
+        import_eve_character.delay(d['ceoID'], callback=link_ceo.subtask(corporation=corpobj.id))
+
+        corpobj.api_last_updated = datetime.utcnow()
+        corpobj.save()
+
+    return EVEPlayerCorporation.objects.get(pk=corpobj.pk)
+
+
+@task(ignore_result=True)
+def link_ceo(corporation, character):
+    """ Links a character to the CEO position of a corporation """
+    corpobj = EVEPlayerCorporation.objects.get(id=corporation)
+    corpobj.ceo_character = EVEPlayerCharacter.objects.get(id=character)
+    corpobj.save()
 
 
 @task(ignore_result=True)