mirror of
https://github.com/nikdoof/test-auth.git
synced 2025-12-14 06:42:16 +00:00
Corporate Management stage 1
This changeset adds a couple of new features to the API, it pulls in all characters on a corp basis, if a director's API key is available, and updates last login/logoff date/times for each corp member.
This commit is contained in:
73
eve_api/api_puller/corp_management.py
Normal file
73
eve_api/api_puller/corp_management.py
Normal file
@@ -0,0 +1,73 @@
|
||||
"""
|
||||
This module abstracts the pulling of account data from the EVE API.
|
||||
"""
|
||||
from xml.dom import minidom
|
||||
from datetime import datetime
|
||||
|
||||
from datetime import datetime
|
||||
from django.conf import settings
|
||||
from eve_proxy.models import CachedDocument
|
||||
from eve_api.app_defines import *
|
||||
from eve_api.api_exceptions import APIAuthException, APINoUserIDException
|
||||
from eve_api.models import EVEAccount, EVEPlayerCharacter, EVEPlayerCorporation
|
||||
|
||||
|
||||
def pull_corp_members(api_key, user_id, character_id):
|
||||
"""
|
||||
This function pulls all corporation members from the EVE API using a director's
|
||||
API key. It'll add as much information as it can about the character.
|
||||
"""
|
||||
|
||||
# grab and decode /corp/MemberTracking.xml.aspx
|
||||
auth_params = {'userID': user_id, 'apiKey': api_key, 'characterID': character_id }
|
||||
char_doc = CachedDocument.objects.api_query('/corp/MemberTracking.xml.aspx',
|
||||
params=auth_params,
|
||||
no_cache=False)
|
||||
|
||||
dom = minidom.parseString(char_doc.body)
|
||||
if dom.getElementsByTagName('error'):
|
||||
return
|
||||
nodes = dom.getElementsByTagName('result')[0].childNodes
|
||||
|
||||
values = {}
|
||||
for node in nodes:
|
||||
if node.nodeType == 1:
|
||||
node.normalize()
|
||||
if len(node.childNodes) == 1:
|
||||
values[node.tagName] = node.childNodes[0].nodeValue
|
||||
else:
|
||||
nv = {}
|
||||
if node.tagName == "rowset":
|
||||
rset = []
|
||||
for nd in node.childNodes:
|
||||
if nd.nodeType == 1:
|
||||
d = {}
|
||||
for e in nd.attributes.keys():
|
||||
d[e] = nd.attributes[e].value
|
||||
rset.append(d)
|
||||
values[node.attributes['name'].value] = rset
|
||||
else:
|
||||
for nd in node.childNodes:
|
||||
if nd.nodeType == 1:
|
||||
nv[nd.tagName] = nd.childNodes[0].nodeValue
|
||||
values[node.tagName] = nv
|
||||
|
||||
|
||||
# corpID from director
|
||||
corp = EVEPlayerCharacter.objects.get(id=character_id).corporation
|
||||
set = values['members']
|
||||
|
||||
for character in set:
|
||||
|
||||
pchar, created = EVEPlayerCharacter.objects.get_or_create(id=character['characterID'])
|
||||
|
||||
if created:
|
||||
pchar.name = character['name']
|
||||
pchar.corporation = corp
|
||||
pchar.last_login = character['logonDateTime']
|
||||
pchar.last_logoff = character['logoffDateTime']
|
||||
pchar.current_location_id = int(character['locationID'])
|
||||
|
||||
pchar.save()
|
||||
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
import logging
|
||||
import datetime
|
||||
|
||||
from eve_api.models.api_player import EVEAccount, EVEPlayerCorporation
|
||||
from eve_api.models.api_player import EVEAccount, EVEPlayerCorporation, EVEPlayerCharacter
|
||||
import eve_api.api_puller.accounts
|
||||
from eve_api.api_puller.corp_management import pull_corp_members
|
||||
from eve_api.api_exceptions import APIAuthException, APINoUserIDException
|
||||
|
||||
class UpdateAPIs():
|
||||
@@ -43,3 +44,28 @@ class UpdateAPIs():
|
||||
except:
|
||||
self._logger.error('Error updating %s' % corp)
|
||||
continue
|
||||
|
||||
class CorpManagementUpdate():
|
||||
"""
|
||||
Pulls character information from corp directors marked in the DB
|
||||
"""
|
||||
|
||||
settings = { 'update_corp': False }
|
||||
|
||||
last_update_delay = 86400
|
||||
batches = 50
|
||||
|
||||
@property
|
||||
def _logger(self):
|
||||
if not hasattr(self, '__logger'):
|
||||
self.__logger = logging.getLogger(__name__)
|
||||
return self.__logger
|
||||
|
||||
def job(self):
|
||||
directors = EVEPlayerCharacter.objects.filter(director_update=True)
|
||||
|
||||
for director in directors:
|
||||
self._logger.info("Updating: %s / %s" % (director, director.corporation))
|
||||
#api = director.eveaccount
|
||||
api = EVEAccount.objects.get(characters__in=[director])
|
||||
pull_corp_members(api.api_key, api.api_user_id, director.id)
|
||||
|
||||
@@ -1 +1 @@
|
||||
SEQUENCE = ['applications-field', 'total-sp']
|
||||
SEQUENCE = ['applications-field', 'total-sp', 'login-locations', 'director-update']
|
||||
|
||||
7
eve_api/evolutions/director-update.py
Normal file
7
eve_api/evolutions/director-update.py
Normal file
@@ -0,0 +1,7 @@
|
||||
from django_evolution.mutations import *
|
||||
from django.db import models
|
||||
|
||||
MUTATIONS = [
|
||||
AddField('EVEPlayerCharacter', 'applications', models.BooleanField, initial=False)
|
||||
]
|
||||
|
||||
9
eve_api/evolutions/login-locations.py
Normal file
9
eve_api/evolutions/login-locations.py
Normal file
@@ -0,0 +1,9 @@
|
||||
from django_evolution.mutations import *
|
||||
from django.db import models
|
||||
|
||||
MUTATIONS = [
|
||||
AddField('EVEPlayerCharacter', 'current_location_id', models.IntegerField, null=True),
|
||||
AddField('EVEPlayerCharacter', 'last_login', models.DateTimeField, null=True),
|
||||
AddField('EVEPlayerCharacter', 'last_logoff', models.DateTimeField, null=True)
|
||||
]
|
||||
|
||||
@@ -67,14 +67,26 @@ class EVEPlayerCharacter(EVEAPIModel):
|
||||
race = models.IntegerField(blank=True, null=True, choices=API_RACES_CHOICES)
|
||||
gender = models.IntegerField(blank=True, null=True, choices=API_GENDER_CHOICES)
|
||||
balance = models.FloatField("Account Balance", blank=True, null=True)
|
||||
|
||||
attrib_intelligence = models.IntegerField("Intelligence", blank=True,
|
||||
null=True)
|
||||
attrib_memory = models.IntegerField("Memory", blank=True, null=True)
|
||||
attrib_charisma = models.IntegerField("Charisma", blank=True, null=True)
|
||||
attrib_perception = models.IntegerField("Perception", blank=True, null=True)
|
||||
attrib_willpower = models.IntegerField("Willpower", blank=True, null=True)
|
||||
|
||||
total_sp = models.IntegerField("Total SP", blank=True, null=True)
|
||||
|
||||
current_location_id = models.IntegerField("Current Location ID", blank=True, null=True)
|
||||
last_login = models.DateTimeField(blank=True, null=True,
|
||||
verbose_name="Last Login Date/Time",
|
||||
help_text="The last time this character logged into EVE")
|
||||
last_logoff = models.DateTimeField(blank=True, null=True,
|
||||
verbose_name="Last Logoff Date/Time",
|
||||
help_text="The last time this character logged off EVE")
|
||||
|
||||
director_update = models.BooleanField(blank=False, default=False,
|
||||
verbose_name="Director Update",
|
||||
help_text="This character is a Director of the associated corporation and should be used for updates")
|
||||
|
||||
objects = EVEPlayerCharacterManager()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user