From 6b485e6a5097ff7f98b773e060501fb80e51674d Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Fri, 10 Sep 2010 09:20:45 +0100 Subject: [PATCH] Now stores API key type and cron jobs now identify which key to use instead of being static defined --- eve_api/api_puller/accounts.py | 18 +++ eve_api/app_defines.py | 10 ++ eve_api/cron.py | 9 +- ...ter_director_update__add_field_eveplaye.py | 138 ++++++++++++++++++ eve_api/models/api_player.py | 12 +- templates/sso/profile.html | 3 +- 6 files changed, 181 insertions(+), 9 deletions(-) create mode 100644 eve_api/migrations/0002_auto__del_field_eveplayercharacter_director_update__add_field_eveplaye.py diff --git a/eve_api/api_puller/accounts.py b/eve_api/api_puller/accounts.py index 7dc265e..60a70d8 100755 --- a/eve_api/api_puller/accounts.py +++ b/eve_api/api_puller/accounts.py @@ -90,6 +90,24 @@ def import_eve_account(api_key, user_id, force_cache=False): # This must be a Text node, ignore it. continue + # Check API keytype if we have a character and a unknown key status + if account.api_keytype == API_KEYTYPE_UNKNOWN and len(account.characters.all()): + auth_params['characterID'] = account.characters.all()[0].id + keycheck = CachedDocument.objects.api_query('/char/AccountBalance.xml.aspx', params=auth_params, no_cache=True) + + if keycheck: + dom = minidom.parseString(keycheck.body.encode('utf-8')) + enode = dom.getElementsByTagName('error') + + if enode and int(enode[0].getAttribute('code')) == 200: + account.api_keytype = API_KEYTYPE_LIMITED + elif not enode: + account.api_keytype = API_KEYTYPE_FULL + else: + account.api_keytype = API_KEYTYPE_UNKNOWN + else: + account.api_keytype = API_KEYTYPE_UNKNOWN + account.api_last_updated = datetime.utcnow() account.save() return account diff --git a/eve_api/app_defines.py b/eve_api/app_defines.py index a8fd30f..ad56540 100644 --- a/eve_api/app_defines.py +++ b/eve_api/app_defines.py @@ -16,6 +16,16 @@ API_STATUS_CHOICES = ( (API_STATUS_ACC_EXPIRED, 'Account Expired'), ) +API_KEYTYPE_UNKNOWN = 0 +API_KEYTYPE_LIMITED = 1 +API_KEYTYPE_FULL = 2 + +API_KEYTYPE_CHOICES = ( + (API_KEYTYPE_UNKNOWN, 'Unknown'), + (API_KEYTYPE_LIMITED, 'Limited'), + (API_KEYTYPE_FULL, 'Full'), +) + API_GENDER_CHOICES = ( (1, 'Male'), (2, 'Female'), diff --git a/eve_api/cron.py b/eve_api/cron.py index 8d232cf..2f5279c 100644 --- a/eve_api/cron.py +++ b/eve_api/cron.py @@ -6,6 +6,7 @@ import eve_api.api_puller.accounts from eve_api.api_puller.alliances import __start_full_import as alliance_import from eve_api.api_puller.corp_management import pull_corp_members from eve_api.api_exceptions import APIAuthException, APINoUserIDException +from eve_api.app_defines import * class UpdateAPIs(): """ @@ -63,13 +64,13 @@ class CorpManagementUpdate(): return self.__logger def job(self): - directors = EVEPlayerCharacter.objects.filter(director_update=True) + directors = EVEPlayerCharacter.objects.filter(director=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) + if api.api_type == API_KEYTYPE_FULL: + self._logger.info("Updating: %s / %s" % (director, director.corporation)) + pull_corp_members(api.api_key, api.api_user_id, director.id) class AllianceUpdate(): """ diff --git a/eve_api/migrations/0002_auto__del_field_eveplayercharacter_director_update__add_field_eveplaye.py b/eve_api/migrations/0002_auto__del_field_eveplayercharacter_director_update__add_field_eveplaye.py new file mode 100644 index 0000000..d04816e --- /dev/null +++ b/eve_api/migrations/0002_auto__del_field_eveplayercharacter_director_update__add_field_eveplaye.py @@ -0,0 +1,138 @@ +# encoding: utf-8 +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Deleting field 'EVEPlayerCharacter.director_update' + db.delete_column('eve_api_eveplayercharacter', 'director_update') + + # Adding field 'EVEPlayerCharacter.director' + db.add_column('eve_api_eveplayercharacter', 'director', self.gf('django.db.models.fields.BooleanField')(default=False, blank=True), keep_default=False) + + # Adding field 'EVEAccount.api_keytype' + db.add_column('eve_api_eveaccount', 'api_keytype', self.gf('django.db.models.fields.IntegerField')(default=0), keep_default=False) + + + def backwards(self, orm): + + # Adding field 'EVEPlayerCharacter.director_update' + db.add_column('eve_api_eveplayercharacter', 'director_update', self.gf('django.db.models.fields.BooleanField')(default=False, blank=True), keep_default=False) + + # Deleting field 'EVEPlayerCharacter.director' + db.delete_column('eve_api_eveplayercharacter', 'director') + + # Deleting field 'EVEAccount.api_keytype' + db.delete_column('eve_api_eveaccount', 'api_keytype') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'unique': 'True'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'max_length': '30', 'unique': 'True'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'eve_api.eveaccount': { + 'Meta': {'object_name': 'EVEAccount'}, + 'api_key': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + 'api_keytype': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'api_last_updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'api_status': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'api_user_id': ('django.db.models.fields.IntegerField', [], {}), + 'characters': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['eve_api.EVEPlayerCharacter']", 'symmetrical': 'False', 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) + }, + 'eve_api.eveplayeralliance': { + 'Meta': {'object_name': 'EVEPlayerAlliance'}, + 'api_last_updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_founded': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'member_count': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'ticker': ('django.db.models.fields.CharField', [], {'max_length': '15', 'blank': 'True'}) + }, + 'eve_api.eveplayercharacter': { + 'Meta': {'object_name': 'EVEPlayerCharacter'}, + 'api_last_updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'attrib_charisma': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'attrib_intelligence': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'attrib_memory': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'attrib_perception': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'attrib_willpower': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'balance': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'corporation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['eve_api.EVEPlayerCorporation']", 'null': 'True', 'blank': 'True'}), + 'current_location_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'director': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'gender': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'last_logoff': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'race': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'total_sp': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'eve_api.eveplayercorporation': { + 'Meta': {'object_name': 'EVEPlayerCorporation'}, + 'alliance': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['eve_api.EVEPlayerAlliance']", 'null': 'True', 'blank': 'True'}), + 'alliance_join_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'api_last_updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'applications': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'ceo_character': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['eve_api.EVEPlayerCharacter']", 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'logo_color1': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'logo_color2': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'logo_color3': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'logo_graphic_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'logo_shape1': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'logo_shape2': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'logo_shape3': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'member_count': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'shares': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'tax_rate': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'ticker': ('django.db.models.fields.CharField', [], {'max_length': '15', 'null': 'True', 'blank': 'True'}), + 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['eve_api'] diff --git a/eve_api/models/api_player.py b/eve_api/models/api_player.py index 4a37232..04ca65c 100644 --- a/eve_api/models/api_player.py +++ b/eve_api/models/api_player.py @@ -7,7 +7,7 @@ from django.db import models from django.contrib.auth.models import User, Group from eve_proxy.models import CachedDocument from eve_api.managers import EVEPlayerCorporationManager, EVEPlayerAllianceManager, EVEPlayerCharacterManager -from eve_api.app_defines import API_STATUS_CHOICES, API_STATUS_PENDING, API_RACES_CHOICES, API_GENDER_CHOICES +from eve_api.app_defines import * class EVEAPIModel(models.Model): """ @@ -39,6 +39,10 @@ class EVEAccount(EVEAPIModel): verbose_name="API Status", help_text="End result of the last attempt at updating this object from the API.") + api_keytype = models.IntegerField(choices=API_KEYTYPE_CHOICES, + default=API_KEYTYPE_UNKNOWN, + verbose_name="API Key Type", + help_text="Type of API key") def in_corp(self, corpid): for char in self.characters.all(): @@ -79,9 +83,9 @@ class EVEPlayerCharacter(EVEAPIModel): 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") + director = models.BooleanField(blank=False, default=False, + verbose_name="Director", + help_text="This character is a Director of the associated corporation") objects = EVEPlayerCharacterManager() diff --git a/templates/sso/profile.html b/templates/sso/profile.html index c4996a8..6d59eea 100644 --- a/templates/sso/profile.html +++ b/templates/sso/profile.html @@ -63,13 +63,14 @@ setup.

{% if eveaccounts %} - + {% for acc in eveaccounts %} +
User IDAPI KeyDescriptionActiveLast UpdatedActions
User IDAPI KeyDescriptionTypeActiveLast UpdatedActions
{{ acc.api_user_id }} {{ acc.api_key }} {{ acc.description }}{{ acc.get_api_keytype_display }} {{ acc.get_api_status_display }} {{ acc.api_last_updated|naturaltimediff }} Refresh,