Reimplement the 'fix names' task, oops

Author: madcowfred

evething/settings.py

@@ -243,24 +243,13 @@
         'args': (),
     },
 
-    # # update unknown Characters every hour
-    # 'fix-unknown-characters': {
-    #     'task': 'thing.tasks.fix_unknown_characters',
-    #     'schedule': timedelta(hours=1),
-    #     'options': {
-    #         'expires': 59 * 60,
-    #     },
-    #     'args': (),
-    # },
-
-    # # generate hourly task summaries at xx:01
-    # 'task-summaries': {
-    #     'task': 'thing.tasks.task_summaries',
-    #     'schedule': crontab(minute=1),
-    #     'options': {
-    #         'expires': 9,
-    #         'queue': 'et_high',
-    #     },
-    #     'args': (),
-    # },
+    # update unknown character/corporation names every hour
+    'fix-names': {
+        'task': 'thing.fix_names',
+        'schedule': timedelta(hours=1),
+        'options': {
+            'expires': 59 * 60,
+        },
+        'args': (),
+    },
 }

thing/tasks/__init__.py

@@ -29,5 +29,6 @@
 from serverstatus import ServerStatus
 
 # Periodic tasks
+from fixnames import FixNames
 from historyupdater import HistoryUpdater
 from priceupdater import PriceUpdater

thing/tasks/fixnames.py

@@ -0,0 +1,80 @@
+from .apitask import APITask
+
+from thing.models import Character, Corporation
+
+# ---------------------------------------------------------------------------
+# Periodic task to try to fix *UNKNOWN* Character objects
+CHAR_NAME_URL = '/eve/CharacterName.xml.aspx'
+CORP_SHEET_URL = '/corp/CorporationSheet.xml.aspx'
+
+class FixNames(APITask):
+    name = 'thing.fix_names'
+
+    def run(self):
+        self.init()
+
+        # Fetch all unknown Character objects
+        char_map = {}
+        for char in Character.objects.filter(name='*UNKNOWN*'):
+            char_map[char.id] = char
+
+        # Fetch all unknown Corporation objects
+        corp_map = {}
+        for corp in Corporation.objects.filter(name='*UNKNOWN*'):
+            corp_map[corp.id] = corp
+
+        ids = list(set(char_map.keys()) | set(corp_map.keys()))
+        if len(ids) == 0:
+            return
+
+        # Go fetch names for them
+        name_map = {}
+        for i in range(0, len(ids), 250):
+            params = { 'ids': ','.join(map(str, ids[i:i+250])) }
+
+            if self.fetch_api(CHAR_NAME_URL, params, use_auth=False) is False or self.root is None:
+                return False
+
+            # <row name="Tazuki Falorn" characterID="1759080617"/>
+            for row in self.root.findall('result/rowset/row'):
+                name_map[int(row.attrib['characterID'])] = row.attrib['name']
+
+        if len(name_map) == 0:
+            return
+
+        # Fix corporation names first
+        for id, corp in corp_map.items():
+            corp_name = name_map.get(id)
+            if corp_name is not None:
+                corp.name = corp_name
+                corp.save()
+                del name_map[id]
+
+        # Ugh, now go look up all of the damn names just in case they're corporations
+        new_corps = []
+        for id, name in name_map.items():
+            params = { 'corporationID': id }
+            
+            # Not a corporation, update the Character object
+            if self.fetch_api(CORP_SHEET_URL, params, use_auth=False) is False or self.root is None:
+                char = char_map.get(id)
+                char.name = name
+                char.save()
+            else:
+                new_corps.append(Corporation(
+                    id=id,
+                    name=name,
+                    ticker=self.root.find('result/ticker').text,
+                ))
+
+        # Now we can create the new corporation objects
+        corp_map = Corporation.objects.in_bulk([c.id for c in new_corps])
+        new_corps = [c for c in new_corps if c.id not in corp_map]
+        Corporation.objects.bulk_create(new_corps)
+
+        # And finally delete any characters that have equivalent corporations now
+        cursor = self.get_cursor()
+        cursor.execute('DELETE FROM thing_character WHERE id IN (SELECT id FROM thing_corporation)')
+        cursor.close()
+
+        return True