Implement rulesets. Fixes #22

This commit is contained in:
Trever Fischer
2012-03-05 19:43:56 -05:00
parent 046ad49823
commit e127b157f0
6 changed files with 98 additions and 0 deletions

View File

@@ -0,0 +1,80 @@
# 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 'Server.ruleset'
db.add_column('minecraft_server', 'ruleset', self.gf('django.db.models.fields.TextField')(default=''), keep_default=False)
def backwards(self, orm):
# Deleting field 'Server.ruleset'
db.delete_column('minecraft_server', 'ruleset')
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'})
},
'minecraft.motd': {
'Meta': {'object_name': 'MOTD'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'server': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['minecraft.Server']"}),
'text': ('django.db.models.fields.TextField', [], {})
},
'minecraft.server': {
'Meta': {'object_name': 'Server'},
'hostname': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'port': ('django.db.models.fields.IntegerField', [], {'default': '25565'}),
'query_port': ('django.db.models.fields.IntegerField', [], {'default': '25565'}),
'ruleset': ('django.db.models.fields.TextField', [], {'default': "''"})
}
}
complete_apps = ['minecraft']

View File

@@ -17,6 +17,7 @@ class Server(models.Model):
hostname = models.CharField(max_length=100)
port = models.IntegerField(default=25565)
query_port = models.IntegerField(default=25565)
ruleset = models.TextField(default='')
class Meta:
permissions = (

View File

@@ -2,4 +2,6 @@ from django.conf.urls.defaults import patterns, include, url
urlpatterns = patterns('minecraft',
url(r'^avatar/(?P<username>.*).png$', 'views.avatar'),
url(r'^rules/(?P<server>.*):(?P<port>[0-9]+)$', 'views.rules'),
url(r'^rules/(?P<server>.*)$', 'views.rules', kwargs={'port':25565})
)

View File

@@ -4,6 +4,8 @@ from urllib2 import urlopen
from cStringIO import StringIO
from django.core.cache import cache
from django.views.decorators.cache import cache_control
from django.shortcuts import render_to_response
import models
def avatar(request, username):
avatar = cache.get('minecraft-avatar-%s'%(username))
@@ -17,3 +19,7 @@ def avatar(request, username):
avatar = buf.getvalue()
cache.set('minecraft-avatar-%s', avatar, 86400)
return HttpResponse(avatar, content_type="image/png")
def rules(request, server, port):
s = models.Server.objects.get(hostname__exact=server, port__exact=port)
return render_to_response('minecraft/rules.html', {'server': s})

View File

@@ -6,6 +6,7 @@
</div>
{% for server in minecraft_servers %}
<a href="http://{{server.hostname}}/map/">Live Map</a>
<a href="{% url minecraft.views.rules server=server.hostname port=server.port %}">Server Rules</a>
<h3>{{server.hostname}}:{{server.port}}</h3>
<ul>
{% if server.online_players %}

View File

@@ -0,0 +1,8 @@
{% extends 'base_simple.html' %}
{% load markup %}
{% block sectiontitle %}Server Rules{% endblock %}
{% block content %}
{{server.ruleset|markdown}}
{% endblock %}