From 59e086e72075e79fc018fa7fb7cb1cc57c9cc0bf Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Tue, 7 Dec 2010 14:50:39 +0000 Subject: [PATCH] Rearrange the models files into the respective levels, add DB layout for skills storage --- ...ll__add_eveskill__del_field_eveplayerch.py | 173 +++++++++++++++ eve_api/models/__init__.py | 22 +- eve_api/models/account.py | 38 ++++ eve_api/models/alliance.py | 27 +++ eve_api/models/api_player.py | 201 ------------------ eve_api/models/character.py | 60 ++++++ eve_api/models/corporation.py | 43 ++++ eve_api/models/static.py | 46 ++++ 8 files changed, 408 insertions(+), 202 deletions(-) create mode 100644 eve_api/migrations/0008_auto__add_eveplayercharacterskill__add_eveskill__del_field_eveplayerch.py create mode 100644 eve_api/models/account.py create mode 100644 eve_api/models/alliance.py delete mode 100644 eve_api/models/api_player.py create mode 100644 eve_api/models/character.py create mode 100644 eve_api/models/corporation.py create mode 100644 eve_api/models/static.py diff --git a/eve_api/migrations/0008_auto__add_eveplayercharacterskill__add_eveskill__del_field_eveplayerch.py b/eve_api/migrations/0008_auto__add_eveplayercharacterskill__add_eveskill__del_field_eveplayerch.py new file mode 100644 index 0000000..54cea91 --- /dev/null +++ b/eve_api/migrations/0008_auto__add_eveplayercharacterskill__add_eveskill__del_field_eveplayerch.py @@ -0,0 +1,173 @@ +# 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): + + # Adding model 'EVEPlayerCharacterSkill' + db.create_table('eve_api_eveplayercharacterskill', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('character', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['eve_api.EVEPlayerCharacter'])), + ('skill', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['eve_api.EVESkill'])), + ('level', self.gf('django.db.models.fields.IntegerField')()), + )) + db.send_create_signal('eve_api', ['EVEPlayerCharacterSkill']) + + # Adding model 'EVESkill' + db.create_table('eve_api_eveskill', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('name', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), + ('description', self.gf('django.db.models.fields.TextField')(blank=True)), + )) + db.send_create_signal('eve_api', ['EVESkill']) + + # Deleting field 'EVEPlayerCharacterRole.api_last_updated' + db.delete_column('eve_api_eveplayercharacterrole', 'api_last_updated') + + + def backwards(self, orm): + + # Deleting model 'EVEPlayerCharacterSkill' + db.delete_table('eve_api_eveplayercharacterskill') + + # Deleting model 'EVESkill' + db.delete_table('eve_api_eveskill') + + # Adding field 'EVEPlayerCharacterRole.api_last_updated' + db.add_column('eve_api_eveplayercharacterrole', 'api_last_updated', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True), keep_default=False) + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", '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'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + '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', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", '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': {'ordering': "['api_user_id']", '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', [], {'symmetrical': 'False', 'to': "orm['eve_api.EVEPlayerCharacter']", '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': {'ordering': "['date_founded']", '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'}), + 'executor': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['eve_api.EVEPlayerCorporation']", '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'}), + 'corporation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'current_location_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'director': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + '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'}), + 'roles': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['eve_api.EVEPlayerCharacterRole']", 'null': 'True', 'blank': 'True'}), + 'security_status': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'skills': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['eve_api.EVESkill']", 'through': "orm['eve_api.EVEPlayerCharacterSkill']", 'symmetrical': 'False'}), + 'total_sp': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'eve_api.eveplayercharacterrole': { + 'Meta': {'object_name': 'EVEPlayerCharacterRole'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'roleid': ('django.db.models.fields.CharField', [], {'max_length': '64'}) + }, + 'eve_api.eveplayercharacterskill': { + 'Meta': {'object_name': 'EVEPlayerCharacterSkill'}, + 'character': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['eve_api.EVEPlayerCharacter']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'level': ('django.db.models.fields.IntegerField', [], {}), + 'skill': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['eve_api.EVESkill']"}) + }, + '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'}), + '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'}) + }, + 'eve_api.eveskill': { + 'Meta': {'object_name': 'EVESkill'}, + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) + } + } + + complete_apps = ['eve_api'] diff --git a/eve_api/models/__init__.py b/eve_api/models/__init__.py index 9475978..de2b371 100644 --- a/eve_api/models/__init__.py +++ b/eve_api/models/__init__.py @@ -3,4 +3,24 @@ By importing all of these sub-modules, the models package is transparently accessible by the rest of the project. This makes it act just as if it were one monolithic models.py. """ -from api_player import * \ No newline at end of file + +from django.db import models + +class EVEAPIModel(models.Model): + """ + A simple abstract base class to set some consistent fields on the models + that are updated from the EVE API. + """ + api_last_updated = models.DateTimeField(blank=True, null=True, + verbose_name="Time last updated from API", + help_text="When this object was last updated from the EVE API.") + + class Meta: + abstract = True + + +from static import * +from account import * +from character import * +from corporation import * +from alliance import * diff --git a/eve_api/models/account.py b/eve_api/models/account.py new file mode 100644 index 0000000..fd4cf36 --- /dev/null +++ b/eve_api/models/account.py @@ -0,0 +1,38 @@ +from django.db import models +from django.contrib.auth.models import User +from eve_api.app_defines import * +from eve_api.models import EVEAPIModel + +class EVEAccount(EVEAPIModel): + """ + Use this class to store EVE user account information. Note that its use is + entirely optional and up to the developer's discretion. + """ + user = models.ForeignKey(User, blank=True, null=True, + help_text="User that owns this account") + description = models.CharField(max_length=50, blank=True, + help_text="User-provided description.") + api_key = models.CharField(max_length=64, verbose_name="API Key") + api_user_id = models.IntegerField(verbose_name="API User ID") + characters = models.ManyToManyField('eve_api.EVEPlayerCharacter', blank=True, null=True) + api_status = models.IntegerField(choices=API_STATUS_CHOICES, + default=API_STATUS_PENDING, + 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 __unicode__(self): + return u"%s" % self.id + + def in_corp(self, corpid): + return self.character.filter(corporation__id=corpid).count() + + class Meta: + app_label = 'eve_api' + verbose_name = 'EVE Account' + verbose_name_plural = 'EVE Accounts' + ordering = ['api_user_id'] + diff --git a/eve_api/models/alliance.py b/eve_api/models/alliance.py new file mode 100644 index 0000000..9af71a1 --- /dev/null +++ b/eve_api/models/alliance.py @@ -0,0 +1,27 @@ +from django.db import models +from django.contrib.auth.models import Group +from eve_api.models import EVEAPIModel + +class EVEPlayerAlliance(EVEAPIModel): + """ + Represents a player-controlled alliance. Updated from the alliance + EVE XML API puller at intervals. + """ + name = models.CharField(max_length=255, blank=True, null=False) + ticker = models.CharField(max_length=15, blank=True, null=False) + executor = models.ForeignKey('eve_api.EVEPlayerCorporation', blank=True, null=True) + member_count = models.IntegerField(blank=True, null=True) + date_founded = models.DateField(blank=True, null=True) + group = models.ForeignKey(Group, blank=True, null=True) + + class Meta: + app_label = 'eve_api' + ordering = ['date_founded'] + verbose_name = 'Player Alliance' + verbose_name_plural = 'Player Alliances' + + def __unicode__(self): + if self.name: + return self.name + else: + return "(#%d)" % self.id diff --git a/eve_api/models/api_player.py b/eve_api/models/api_player.py deleted file mode 100644 index 48f9066..0000000 --- a/eve_api/models/api_player.py +++ /dev/null @@ -1,201 +0,0 @@ -""" -This module holds data from the EVE XML API. -""" -from datetime import datetime - -from django.db import models -from django.contrib.auth.models import User, Group -from eve_proxy.models import CachedDocument -from eve_api.app_defines import * - -class EVEAPIModel(models.Model): - """ - A simple abstract base class to set some consistent fields on the models - that are updated from the EVE API. - """ - api_last_updated = models.DateTimeField(blank=True, null=True, - verbose_name="Time last updated from API", - help_text="When this object was last updated from the EVE API.") - - class Meta: - abstract = True - -class EVEAccount(EVEAPIModel): - """ - Use this class to store EVE user account information. Note that its use is - entirely optional and up to the developer's discretion. - """ - user = models.ForeignKey(User, blank=True, null=True, - help_text="User that owns this account") - description = models.CharField(max_length=50, blank=True, - help_text="User-provided description.") - api_key = models.CharField(max_length=64, verbose_name="API Key") - api_user_id = models.IntegerField(verbose_name="API User ID") - characters = models.ManyToManyField("EVEPlayerCharacter", blank=True, - null=True) - api_status = models.IntegerField(choices=API_STATUS_CHOICES, - default=API_STATUS_PENDING, - 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 __unicode__(self): - return u"%s" % self.id - - def __str__(self): - return self.__unicode__() - - def in_corp(self, corpid): - for char in self.characters.all(): - if char.corporation_id == corpid: - return True - return False - - class Meta: - app_label = 'eve_api' - verbose_name = 'EVE Account' - verbose_name_plural = 'EVE Accounts' - ordering = ['api_user_id'] - -class EVEPlayerCharacter(EVEAPIModel): - """ - Represents an individual player character within the game. Not to be - confused with an account. - """ - name = models.CharField(max_length=255, blank=True, null=False) - corporation = models.ForeignKey('EVEPlayerCorporation', blank=True, null=True) - corporation_date = models.DateTimeField(blank=True, null=True, verbose_name="Corporation Join Date") - 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) - - security_status = models.FloatField("Security Status", 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 = models.BooleanField(blank=False, default=False, - verbose_name="Director", - help_text="This character is a Director of the associated corporation") - - roles = models.ManyToManyField("EVEPlayerCharacterRole", blank=True, - null=True) - - def __unicode__(self): - if self.name: - return self.name - else: - return "(%d)" % self.id - - def __str__(self): - return self.__unicode__() - - class Meta: - app_label = 'eve_api' - verbose_name = 'Player Character' - verbose_name_plural = 'Player Characters' - -class EVEPlayerCharacterRole(EVEAPIModel): - """ - Represents a role which can be applied to a character - """ - - roleid = models.CharField(max_length=64, blank=False, null=False) - name = models.CharField(max_length=255, blank=False, null=False) - - def __unicode__(self): - if self.name: - return self.name - else: - return self.id - - def __str__(self): - return self.__unicode__() - - class Meta: - app_label = 'eve_api' - verbose_name = 'Player Role' - verbose_name_plural = 'Player Roles' - -class EVEPlayerCorporation(EVEAPIModel): - """ - Represents a player-controlled corporation. Updated from a mixture of - the alliance and corporation API pullers. - """ - name = models.CharField(max_length=255, blank=True, null=True) - ticker = models.CharField(max_length=15, blank=True, null=True) - description = models.TextField(blank=True, null=True) - url = models.URLField(verify_exists=False, blank=True, null=True) - ceo_character = models.ForeignKey(EVEPlayerCharacter, blank=True, null=True) - alliance = models.ForeignKey('eve_api.EVEPlayerAlliance', blank=True, null=True) - alliance_join_date = models.DateField(blank=True, null=True) - tax_rate = models.FloatField(blank=True, null=True) - member_count = models.IntegerField(blank=True, null=True) - shares = models.IntegerField(blank=True, null=True) - - # Logo generation stuff - logo_graphic_id = models.IntegerField(blank=True, null=True) - logo_shape1 = models.IntegerField(blank=True, null=True) - logo_shape2 = models.IntegerField(blank=True, null=True) - logo_shape3 = models.IntegerField(blank=True, null=True) - logo_color1 = models.IntegerField(blank=True, null=True) - logo_color2 = models.IntegerField(blank=True, null=True) - logo_color3 = models.IntegerField(blank=True, null=True) - - group = models.ForeignKey(Group, blank=True, null=True) - applications = models.BooleanField(blank=False, default=False) - - class Meta: - app_label = 'eve_api' - verbose_name = 'Player Corporation' - verbose_name_plural = 'Player Corporations' - - def __str__(self): - if self.name: - return self.name - else: - return "Corp #%d" % self.id - -class EVEPlayerAlliance(EVEAPIModel): - """ - Represents a player-controlled alliance. Updated from the alliance - EVE XML API puller at intervals. - """ - name = models.CharField(max_length=255, blank=True, null=False) - ticker = models.CharField(max_length=15, blank=True, null=False) - executor = models.ForeignKey(EVEPlayerCorporation, blank=True, null=True) - member_count = models.IntegerField(blank=True, null=True) - date_founded = models.DateField(blank=True, null=True) - group = models.ForeignKey(Group, blank=True, null=True) - - class Meta: - app_label = 'eve_api' - ordering = ['date_founded'] - verbose_name = 'Player Alliance' - verbose_name_plural = 'Player Alliances' - - def __unicode__(self): - if self.name: - return self.name - else: - return "(#%d)" % self.id - - def __str__(self): - return self.__unicode__() - diff --git a/eve_api/models/character.py b/eve_api/models/character.py new file mode 100644 index 0000000..49fa6b5 --- /dev/null +++ b/eve_api/models/character.py @@ -0,0 +1,60 @@ +from django.db import models +from eve_api.app_defines import * +from eve_api.models import EVEAPIModel + + +class EVEPlayerCharacter(EVEAPIModel): + """ + Represents an individual player character within the game. Not to be + confused with an account. + """ + name = models.CharField(max_length=255, blank=True, null=False) + corporation = models.ForeignKey('eve_api.EVEPlayerCorporation', blank=True, null=True) + corporation_date = models.DateTimeField(blank=True, null=True, verbose_name="Corporation Join Date") + 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) + security_status = models.FloatField("Security Status", 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 = models.BooleanField(blank=False, default=False, verbose_name="Director", + help_text="This character is a Director of the associated corporation") + roles = models.ManyToManyField('eve_api.EVEPlayerCharacterRole', blank=True, null=True, + help_text="Roles associated with this character") + skills = models.ManyToManyField('eve_api.EVESkill', through='eve_api.EVEPlayerCharacterSkill') + + def __unicode__(self): + if self.name: + return self.name + else: + return u"(%d)" % self.id + + class Meta: + app_label = 'eve_api' + verbose_name = 'Player Character' + verbose_name_plural = 'Player Characters' + + +class EVEPlayerCharacterSkill(models.Model): + """ + For our m2m join to EVESkills + """ + character = models.ForeignKey('eve_api.EVEPlayerCharacter') + skill = models.ForeignKey('eve_api.EVESkill') + level = models.IntegerField() + + class Meta: + app_label = 'eve_api' + verbose_name = 'Player Character Skill' + verbose_name_plural = 'Player Character Skills' + diff --git a/eve_api/models/corporation.py b/eve_api/models/corporation.py new file mode 100644 index 0000000..f3f95de --- /dev/null +++ b/eve_api/models/corporation.py @@ -0,0 +1,43 @@ +from django.db import models +from django.contrib.auth.models import Group +from eve_api.models import EVEAPIModel + +class EVEPlayerCorporation(EVEAPIModel): + """ + Represents a player-controlled corporation. Updated from a mixture of + the alliance and corporation API pullers. + """ + name = models.CharField(max_length=255, blank=True, null=True) + ticker = models.CharField(max_length=15, blank=True, null=True) + description = models.TextField(blank=True, null=True) + url = models.URLField(verify_exists=False, blank=True, null=True) + ceo_character = models.ForeignKey('eve_api.EVEPlayerCharacter', blank=True, null=True) + alliance = models.ForeignKey('eve_api.EVEPlayerAlliance', blank=True, null=True) + alliance_join_date = models.DateField(blank=True, null=True) + tax_rate = models.FloatField(blank=True, null=True) + member_count = models.IntegerField(blank=True, null=True) + shares = models.IntegerField(blank=True, null=True) + + # Logo generation stuff + logo_graphic_id = models.IntegerField(blank=True, null=True) + logo_shape1 = models.IntegerField(blank=True, null=True) + logo_shape2 = models.IntegerField(blank=True, null=True) + logo_shape3 = models.IntegerField(blank=True, null=True) + logo_color1 = models.IntegerField(blank=True, null=True) + logo_color2 = models.IntegerField(blank=True, null=True) + logo_color3 = models.IntegerField(blank=True, null=True) + + group = models.ForeignKey(Group, blank=True, null=True) + applications = models.BooleanField(blank=False, default=False) + + class Meta: + app_label = 'eve_api' + verbose_name = 'Player Corporation' + verbose_name_plural = 'Player Corporations' + + def __str__(self): + if self.name: + return self.name + else: + return "Corp #%d" % self.id + diff --git a/eve_api/models/static.py b/eve_api/models/static.py new file mode 100644 index 0000000..3c57331 --- /dev/null +++ b/eve_api/models/static.py @@ -0,0 +1,46 @@ +""" +This file covers any static information from the EVE data dumps. While +using django-evedb would be a smarter choice, for the limited subset of +data we're using it isn't worth the overhead +""" + +from django.db import models + + +class EVESkill(models.Model): + """ Represents a skill in EVE Online """ + + name = models.CharField(blank=True, max_length=255) + description = models.TextField(blank=True) + + def __unicode__(self): + if self.name: + return self.name + else: + return u"Skill %d" % self.id + + class Meta: + app_label = 'eve_api' + verbose_name = 'Character Skill' + verbose_name_plural = 'Character Skills' + + +class EVEPlayerCharacterRole(models.Model): + """ + Represents a role which can be applied to a character + """ + + roleid = models.CharField(max_length=64, blank=False, null=False) + name = models.CharField(max_length=255, blank=False, null=False) + + def __unicode__(self): + if self.name: + return self.name + else: + return u"Role %d" % self.id + + class Meta: + app_label = 'eve_api' + verbose_name = 'Character Role' + verbose_name_plural = 'Character Roles' +