split models into apps, new api interface

pandora/layer/admin.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vi:si:et:sw=4:sts=4:ts=4
+
+from django.contrib import admin
+
+import models
+
+
+class BinAdmin(admin.ModelAdmin):
+    search_fields = ['name', 'title']
+admin.site.register(models.Bin, BinAdmin)
+
+class LayerAdmin(admin.ModelAdmin):
+    search_fields = ['name', 'title']
+admin.site.register(models.Layer, LayerAdmin)
+

pandora/layer/models.py

@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+# vi:si:et:sw=4:sts=4:ts=4
+from __future__ import division, with_statement
+
+from datetime import datetime
+import os.path
+import math
+import random
+import re
+import subprocess
+import unicodedata
+from glob import glob
+
+from django.db import models
+from django.db.models import Q
+from django.contrib.auth.models import User
+from django.core.files.base import ContentFile
+from django.utils import simplejson as json
+from django.conf import settings
+
+from ox.django import fields
+import ox
+from ox import stripTags
+from ox.normalize import canonicalTitle, canonicalName
+
+
+class Bin(models.Model):
+    class Meta:
+        ordering = ('position', )
+
+    name = models.CharField(null=True, max_length=255, unique=True)
+    title = models.CharField(null=True, max_length=255)
+	#text, string, string from list(fixme), event, place, person
+    type = models.CharField(null=True, max_length=255)
+    position = models.IntegerField(default=0)
+
+	overlapping = models.BooleanField(default=True)
+	enabled = models.BooleanField(default=True)
+
+	enabled = models.BooleanField(default=True)
+	public = models.BooleanField(default=True)   #false=users only see there own bins
+	subtitle = models.BooleanField(default=True) #bis can be displayed as subtitle, only one bin
+
+	find = models.BooleanField(default=True)
+	#words / item duration(wpm), total words, cuts per minute, cuts, number of layers, number of layers/duration
+    sort = models.CharField(null=True, max_length=255)
+
+    def properties(self):
+        p = {}
+        if self.find:
+            p[self.name] = {'type': 'bin', 'find': True}
+        if self.sort:
+            print 'FIXME: need to add sort stuff'
+        return p
+
+class Layer(models.Model):
+    #FIXME: here having a item,start index would be good
+    created = models.DateTimeField(auto_now_add=True)
+    modified = models.DateTimeField(auto_now=True)
+    user = models.ForeignKey(User)
+    item = models.ForeignKey('item.Item')
+
+    #seconds
+    start = models.FloatField(default=-1)
+    stop = models.FloatField(default=-1)
+
+    type = models.CharField(blank=True, max_length=255)
+    value = models.TextField()
+    
+    #FIXME: relational layers, Locations, clips etc
+    #location = models.ForeignKey('Location', default=None)
+
+    def editable(self, user):
+        if user.is_authenticated():
+            if obj.user == user.id or user.has_perm('0x.admin'):
+                return True
+            if user.groups.filter(id__in=obj.groups.all()).count() > 0:
+                return True
+        return False
+

pandora/layer/tests.py

@@ -0,0 +1,23 @@
+"""
+This file demonstrates two different styles of tests (one doctest and one
+unittest). These will both pass when you run "manage.py test".
+
+Replace these with more appropriate tests for your application.
+"""
+
+from django.test import TestCase
+
+class SimpleTest(TestCase):
+    def test_basic_addition(self):
+        """
+        Tests that 1 + 1 always equals 2.
+        """
+        self.failUnlessEqual(1 + 1, 2)
+
+__test__ = {"doctest": """
+Another way to test that 1 + 1 is equal to 2.
+
+>>> 1 + 1 == 2
+True
+"""}
+

pandora/layer/views.py

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+# vi:si:et:sw=4:sts=4:ts=4
+from __future__ import division
+import os.path
+import re
+from datetime import datetime
+from urllib2 import unquote
+import mimetypes
+
+from django import forms
+from django.core.paginator import Paginator
+from django.contrib.auth.decorators import login_required
+from django.contrib.auth.models import User
+from django.db.models import Q, Avg, Count, Sum
+from django.http import HttpResponse, Http404
+from django.shortcuts import render_to_response, get_object_or_404, get_list_or_404, redirect
+from django.template import RequestContext
+from django.conf import settings
+
+from ox.utils import json
+from ox.django.decorators import login_required_json
+from ox.django.shortcuts import render_to_json_response, get_object_or_404_json, json_response
+from ox.django.http import HttpFileResponse
+import ox
+
+import models
+
+@login_required_json
+def api_addLayer(request):
+    '''
+        param data
+            {key: value}
+        return {'status': {'code': int, 'text': string},
+                'data': {}}
+    '''
+    response = {'status': {'code': 501, 'text': 'not implemented'}}
+    return render_to_json_response(response)
+
+@login_required_json
+def api_removeLayer(request):
+    '''
+        param data
+            {key: value}
+        return {'status': {'code': int, 'text': string},
+                'data': {}}
+    '''
+    response = {'status': {'code': 501, 'text': 'not implemented'}}
+    return render_to_json_response(response)
+
+@login_required_json
+def api_editLayer(request):
+    '''
+        param data
+            {key: value}
+        return {'status': {'code': int, 'text': string},
+                'data': {}}
+    '''
+    response = json_response({})
+    data = json.loads(request.POST['data'])
+    layer = get_object_or_404_json(models.Layer, pk=data['id'])
+    if layer.editable(request.user):
+        response = json_response(status=501, text='not implemented')
+    else:
+        response = json_response(status=403, text='permission denied')
+    return render_to_json_response(response)
+
+    response = json_response(status=501, text='not implemented')
+    return render_to_json_response(response)
+