split models into apps, new api interface

pandora/item/views.py

@@ -17,10 +17,7 @@ from django.shortcuts import render_to_response, get_object_or_404, get_list_or_
 from django.template import RequestContext
 from django.conf import settings
 
-try:
-    import simplejson as json
-except ImportError:
-    from django.utils import simplejson as json
+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
@@ -263,156 +260,6 @@ def api_removeItem(request):
         response = json_response(status=403, text='permission denied')
     return render_to_json_response(response)
 
-@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)
-
-'''
-    List API
-'''
-@login_required_json
-def api_addListItem(request):
-    '''
-        param data
-            {list: listId,
-             item: itemId,
-             quert: ...
-           }
-        return {'status': {'code': int, 'text': string},
-                'data': {}}
-    '''
-    data = json.loads(request.POST['data'])
-    list = get_object_or_404_json(models.List, pk=data['list'])
-    if 'item' in data:
-        item = get_object_or_404_json(models.Item, pk=data['item'])
-        if list.editable(request.user):
-            list.add(item)
-            response = json_response(status=200, text='item removed')
-        else:
-            response = json_response(status=403, text='not allowed')
-    elif 'query' in data:
-        response = json_response(status=501, text='not implemented')
-        
-    else:
-        response = json_response(status=501, text='not implemented')
-    return render_to_json_response(response)
-
-@login_required_json
-def api_removeListItem(request):
-    '''
-        param data
-            {list: listId,
-             item: itemId,
-             quert: ...
-           }
-        return {'status': {'code': int, 'text': string},
-                'data': {}}
-    '''
-    data = json.loads(request.POST['data'])
-    list = get_object_or_404_json(models.List, pk=data['list'])
-    if 'item' in data:
-        item = get_object_or_404_json(models.Item, pk=data['item'])
-        if list.editable(request.user):
-            list.remove(item)
-            response = json_response(status=200, text='item removed')
-        else:
-            response = json_response(status=403, text='not allowed')
-    elif 'query' in data:
-        response = json_response(status=501, text='not implemented')
-        
-    else:
-        response = json_response(status=501, text='not implemented')
-    return render_to_json_response(response)
-
-@login_required_json
-def api_addList(request):
-    '''
-        param data
-            {name: value}
-        return {'status': {'code': int, 'text': string},
-                'data': {}}
-    '''
-    data = json.loads(request.POST['data'])
-    if models.List.filter(name=data['name'], user=request.user).count() == 0:
-        list = models.List(name = data['name'], user=request.user)
-        list.save()
-        response = json_response(status=200, text='created')
-    else:
-        response = json_response(status=403, text='list name exists')
-    return render_to_json_response(response)
-
-@login_required_json
-def api_editList(request):
-    '''
-        param data
-            {key: value}
-        keys: name, public
-        return {'status': {'code': int, 'text': string},
-                'data': {}}
-    '''
-    data = json.loads(request.POST['data'])
-    list = get_object_or_404_json(models.List, pk=data['list'])
-    if list.editable(request.user):
-        for key in data:
-            if key in ('name', 'public'):
-                setattr(list, key, data['key'])
-    else:
-        response = json_response(status=403, text='not allowed')
-    return render_to_json_response(response)
-
-def api_removeList(request):
-    '''
-        param data
-            {key: value}
-        return {'status': {'code': int, 'text': string},
-                'data': {}}
-    '''
-    data = json.loads(request.POST['data'])
-    list = get_object_or_404_json(models.List, pk=data['list'])
-    if list.editable(request.user):
-        list.delete()
-    else:
-        response = json_response(status=403, text='not allowed')
-    return render_to_json_response(response)
-
 '''
     Poster API
 '''
@@ -485,7 +332,6 @@ def api_getImdbId(request):
         response = json_response(status=404, text='not found')
     return render_to_json_response(response)
 
-
 '''
     media delivery
 '''