Add eventsjson.

wraithan · Aug 15, 2012 · d8d9e7f · d8d9e7f
1 parent dd987a3
commit d8d9e7f
Show file tree

Hide file tree

Showing 6 changed files with 478 additions and 11 deletions.
diff --git a/replayswithfriends/sc2match/migrations/0009_auto__add_field_match_events_json.py b/replayswithfriends/sc2match/migrations/0009_auto__add_field_match_events_json.py
@@ -0,0 +1,123 @@
+# -*- coding: 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 'Match.events_json'
+        db.add_column('sc2match_match', 'events_json',
+                      self.gf('django.db.models.fields.TextField')(default='', blank=True),
+                      keep_default=False)
+
+    def backwards(self, orm):
+        # Deleting field 'Match.events_json'
+        db.delete_column('sc2match_match', 'events_json')
+
+    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'})
+        },
+        'sc2match.map': {
+            'Meta': {'object_name': 'Map'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'map_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'region': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
+            'url': ('django.db.models.fields.URLField', [], {'default': "''", 'max_length': '200', 'blank': 'True'})
+        },
+        'sc2match.match': {
+            'Meta': {'ordering': "['-game_played_on', '-modified']", 'unique_together': "(['owner', 'matchhash'],)", 'object_name': 'Match'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'duration': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
+            'events_json': ('django.db.models.fields.TextField', [], {'default': 'None', 'blank': 'True'}),
+            'game_played_on': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'game_speed': ('django.db.models.fields.CharField', [], {'default': 'True', 'max_length': '64', 'blank': 'True'}),
+            'game_type': ('django.db.models.fields.CharField', [], {'default': 'True', 'max_length': '64', 'blank': 'True'}),
+            'gateway': ('django.db.models.fields.CharField', [], {'default': "'us'", 'max_length': '32'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_ladder': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'mapfield': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sc2match.Map']", 'null': 'True'}),
+            'match_share': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
+            'matchhash': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '512', 'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'process_error': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
+            'processed': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'replay_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'})
+        },
+        'sc2match.matchmessage': {
+            'Meta': {'ordering': "['match', 'frame']", 'object_name': 'MatchMessage'},
+            'flags': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'frame': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'match': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'messages'", 'to': "orm['sc2match.Match']"}),
+            'message': ('django.db.models.fields.TextField', [], {}),
+            'player': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sc2match.PlayerResult']"}),
+            'to_all': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'to_allies': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+        },
+        'sc2match.player': {
+            'Meta': {'unique_together': "(['username', 'battle_net_url'],)", 'object_name': 'Player'},
+            'battle_net_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'region': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'max_length': '64'})
+        },
+        'sc2match.playerresult': {
+            'Meta': {'object_name': 'PlayerResult'},
+            'color': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'difficulty': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '64', 'blank': 'True'}),
+            'handicap': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_human': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_observer': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'match': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'players'", 'to': "orm['sc2match.Match']"}),
+            'nick': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '64', 'blank': 'True'}),
+            'pid': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
+            'player': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'matches'", 'null': 'True', 'to': "orm['sc2match.Player']"}),
+            'race': ('django.db.models.fields.CharField', [], {'max_length': '8', 'blank': 'True'}),
+            'random': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'result': ('django.db.models.fields.NullBooleanField', [], {'default': 'None', 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['sc2match']
diff --git a/replayswithfriends/sc2match/models.py b/replayswithfriends/sc2match/models.py
@@ -180,7 +180,7 @@ class Match(models.Model):
     game_played_on = models.DateTimeField(null=True, blank=True)
     game_type = models.CharField(max_length=64, blank=True, default=True)
     game_speed = models.CharField(max_length=64, blank=True, default=True)
-
+    events_json = models.TextField(editable=False, blank=True)
 
     objects = models.Manager()
     share = ShareManager()

diff --git a/replayswithfriends/sc2match/scratch.py b/replayswithfriends/sc2match/scratch.py
@@ -0,0 +1,12 @@
+django-admin.py shell --settings=replayswithfriends.settings.prod
+
+
+from replayswithfriends.sc2match.models import Match
+m = Match.objects.get(id=791)
+m.process_now()
+
+
+from replayswithfriends.sc2match.models import Match
+for m in Match.objects.order_by('id'):
+ m.process_now()
+
diff --git a/replayswithfriends/sc2match/tasks.py b/replayswithfriends/sc2match/tasks.py
@@ -2,9 +2,9 @@
 from .models import Player
 from celery.task import task
 import datetime
-from sc2reader.events import PlayerActionEvent
+from sc2reader.events import *
 from sc2reader.exceptions import ReadError, FileError
-
+import json
 
 def as_signal(sender, instance, created, raw, **kwargs):
     if created:
@@ -42,13 +42,69 @@ def parse_replay(match_id):
     match.gateway = match.replay.gateway
     match.is_ladder = match.replay.is_ladder
 
-    el = []
+    events = []
     for e in match.replay.events:
-        if isinstance(e, PlayerActionEvent):
-            try:
-                print str(e)
-            except Exception, x:
-                print x
+        event = {
+            "pid": e.pid,
+            "frame": e.frame,
+            "second": e.second,
+            "name": e.name,
+            "text": str(e),
+        }
+        if isinstance(e, GameEvent):
+            event.update({
+                'type': e.type,
+                'code': e.code,
+                'is_local': e.is_local,
+                'is_init': e.is_init,
+                'is_player_action': e.is_player_action,
+                'is_camera_movement': e.is_camera_movement,
+                'is_unknown': e.is_unknown,
+            })
+        if isinstance(e, MessageEvent):
+            event.update({
+                'type': 'MessageEvent',
+                'flags': e.flags,
+            })
+        if isinstance(e, ChatEvent):
+            event.update({
+                'target': e.target,
+                'text': e.text,
+                'to_all': e.to_all,
+                'to_allies': e.to_allies,
+            })
+        if isinstance(e, PacketEvent):
+            event['data'] = e.data
+        if isinstance(e, PingEvent):
+            event.update({'x': e.x, 'y': e.y})
+        if isinstance(e, ResourceTransferEvent):
+            event.update({
+                'sender': e.sender,
+                'receiver': e.receiver,
+                'minerals': e.minerals,
+                'vespene': e.vespene,
+            })
+        if isinstance(e, AbilityEvent):
+            event['ability_code'] = e.ability_code
+            event['ability_text'] = e.ability
+        if isinstance(e, TargetAbilityEvent):
+            event['target_string'] = str(e.target)
+        if isinstance(e, LocationAbilityEvent):
+            event['location'] = str(e.location)
+        if isinstance(e, HotkeyEvent):
+            event.update({
+                'hotkey': e.hotkey,
+                'deselect': e.deselect,
+            })
+        if isinstance(e, SelectionEvent):
+            event.update({
+                'bank': e.bank,
+                'objects': [str(x) for x in e.objects],
+                'deselect': e.deselect
+            })
+        events.append(event)
+
+    match.events_json = json.dumps(events)
 
     match.game_played_on = datetime.datetime.fromtimestamp(int(match.replay.unix_timestamp))
     try:

diff --git a/replayswithfriends/sc2match/views.py b/replayswithfriends/sc2match/views.py
@@ -7,6 +7,9 @@
 
 from django.contrib.auth.decorators import login_required
 from django.utils.decorators import method_decorator
+from sc2reader.events import *
+import json
+
 
 class PlayerDetail(DetailView):
     queryset = Player.objects.all()