Tweak vault design to save item positions in the display

api/events.py

@@ -23,6 +23,11 @@ class ChatEvent(Event):
       super(ChatEvent, self).__init__(type='chat', data={'sender': sender,
         'message': message})
 
+class VaultContentsEvent(Event):
+    def __init__(self, player, items):
+      super(VaultContentsEvent, self).__init__(type='vault-contents',
+          data={'player': player, 'items': items})
+
 class QuitEvent(Event):
   def __init__(self, player):
     super(QuitEvent, self).__init__(type='quit', data={'player': player})
@@ -63,6 +68,10 @@ def send_server_event(server, event):
         json = dumps(event, cls=EventEncoder)
         queue.put(json)
 
+def broadcast_server_event(event):
+    for server in Server.objects.all():
+        send_server_event(server, event)
+
 def server_broadcast(message, *args):
     message = message%args
     for server in Server.objects.all():

api/handlers.py

@@ -100,7 +100,10 @@ class ServerEventHandler(BaseHandler):
 
     def create(self, request):
         queue = server_queue(request.server)
-        queue.delete(int(request.POST['job']))
+        try:
+            queue.delete(int(request.POST['job']))
+        except Exception, e:
+            pass
         return {'result': 'success'}
 
     def update(self, request):
@@ -166,18 +169,31 @@ class VaultHandler(BaseHandler):
         items = []
         for slot in player.vault_slots.all():
             items.append({'item': slot.item, 'quantity':
-              slot.quantity, 'damage': slot.damage, 'data': slot.data})
+              slot.quantity, 'damage': slot.damage, 'data': slot.data,
+              'position': slot.position})
         return {'items': items}
 
     def update(self, request, playername):
         player = MinecraftProfile.objects.get(mc_username__exact=playername)
         vaultContents = json.loads(request.POST['contents'])['items']
         stacks = player.vault_slots.all()
-        for stack in stacks:
+        for stack in vaultContents:
-          stack.delete()
+          updated = False
-        for item in vaultContents:
+          slot,created = VaultSlot.objects.get_or_create(player=player,
-          if item['item'] > 0:
+            position=stack['position'])
-            VaultSlot.objects.create(player=player, item=item['item'],
+          if slot.item != stack['item']:
-                quantity=item['quantity'], damage=item['damage'],
+              slot.item = stack['item']
-                data=item['data'])
+              updated = True
+          if slot.quantity != stack['quantity']:
+              slot.quantity = stack['quantity']
+              updated = True
+          if slot.damage != stack['damage']:
+              slot.damage = stack['damage']
+              updated = True
+          if slot.data != stack['data']:
+              slot.data = stack['data']
+              updated = True
+          if updated:
+              print "Saving slot %s(%s): %s"%(slot.position, slot.id, slot.item)
+              slot.save()
         return {'success': True}

vault/migrations/0002_auto__add_field_vaultslot_position.py

@@ -0,0 +1,76 @@
+# 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 field 'VaultSlot.position'
+        db.add_column('vault_vaultslot', 'position', self.gf('django.db.models.fields.IntegerField')(default=0), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'VaultSlot.position'
+        db.delete_column('vault_vaultslot', 'position')
+
+
+    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'})
+        },
+        'minecraft.minecraftprofile': {
+            'Meta': {'object_name': 'MinecraftProfile'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mc_username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
+        },
+        'vault.vaultslot': {
+            'Meta': {'object_name': 'VaultSlot'},
+            'damage': ('django.db.models.fields.IntegerField', [], {}),
+            'data': ('django.db.models.fields.IntegerField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('django.db.models.fields.IntegerField', [], {}),
+            'player': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'vault_slots'", 'to': "orm['minecraft.MinecraftProfile']"}),
+            'position': ('django.db.models.fields.IntegerField', [], {}),
+            'quantity': ('django.db.models.fields.IntegerField', [], {})
+        }
+    }
+
+    complete_apps = ['vault']

vault/models.py

@@ -1,9 +1,64 @@
 from django.db import models
 from minecraft.models import MinecraftProfile
+from django.db.models.signals import post_save, post_delete
+from api.events import VaultContentsEvent, broadcast_server_event
+from minecraft.items import ITEMS
 
 class VaultSlot(models.Model):
     player = models.ForeignKey(MinecraftProfile, related_name='vault_slots')
-    item = models.IntegerField()
+    item = models.IntegerField(default=0)
-    quantity = models.IntegerField()
+    quantity = models.IntegerField(default=-1)
-    damage = models.IntegerField()
+    damage = models.IntegerField(default=0)
-    data = models.IntegerField()
+    data = models.IntegerField(default=0)
+    position = models.IntegerField()
+
+    class Meta:
+        ordering = ['position']
+
+    def __unicode__(self):
+        return "%s.%s: %s %s"%(self.player, self.position, self.quantity, self.item)
+
+    def name(self):
+        name = self.metadata['name'].lower().split('_')
+        return ' '.join(map(lambda x:x[0].upper()+x[1:], name))
+
+    @property
+    def metadata(self):
+        for i in ITEMS:
+          if i['id'] == self.item:
+            return i;
+
+    def damagePct(self):
+      if self.metadata['durability'] == 0:
+        return 100
+      return round((float(self.damage)/float(self.metadata['durability']))*100)
+
+def send_vault_delete(sender, instance, *args, **kwargs):
+  slots = [
+    {
+      'item': None,
+      'quantity': -1,
+      'damage': None,
+      'data': None,
+      'position': instance.position
+    }
+  ]
+  broadcast_server_event(VaultContentsEvent(instance.player.mc_username,
+    slots))
+
+def send_vault_update(sender, instance, created, *args, **kwargs):
+  if created and instance.quantity == -1:
+    return
+  slots = [
+    {
+      'item': instance.item,
+      'quantity': instance.quantity,
+      'damage': instance.damage,
+      'data': instance.data,
+      'position': instance.position
+    }
+  ]
+  broadcast_server_event(VaultContentsEvent(instance.player.mc_username, slots))
+
+post_save.connect(send_vault_update, sender=VaultSlot, dispatch_uid='derp')
+post_delete.connect(send_vault_delete, sender=VaultSlot, dispatch_uid='derp')