From 6511e548bbbac7f05572393e272f95d47829d967 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Tue, 26 Apr 2011 02:25:24 -0400
Subject: reimpleted JSON serialization manually

---
 piccast/feeds/views.py | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'piccast/feeds/views.py')

diff --git a/piccast/feeds/views.py b/piccast/feeds/views.py
index f126932..8ea4b98 100644
--- a/piccast/feeds/views.py
+++ b/piccast/feeds/views.py
@@ -1,6 +1,7 @@
 from django.http import HttpResponse
 from django.core import serializers
 from models import *
+import json
 
 JSONSerializer = serializers.get_serializer("json")
 basic_html = """
@@ -10,34 +11,27 @@ basic_html = """
 <h1>PicCast</h1>
 </html>
 """
+
 def basic_frontpage(request):
     return HttpResponse(basic_html);
 
 def newest_feeds(request):
     feeds = PicFeed.objects.order_by('-created')[:20]
-    json_serializer = JSONSerializer()
-    json_serializer.serialize(feeds)
-    return HttpResponse(json_serializer.getvalue(), mimetype="application/json")
+    return HttpResponse(json.dumps({'list': [f.serializable() for f in feeds]}, indent=2), mimetype="application/json")
 
 def sets_by_feed(request, req_feed):
     # TODO: validate req_feed
     sets = PicSet.objects.filter(feed=req_feed)
-    json_serializer = JSONSerializer()
-    json_serializer.serialize(sets)
-    return HttpResponse(json_serializer.getvalue(), mimetype="application/json")
+    return HttpResponse(json.dumps({'list': [s.serializable() for s in sets]}, indent=2), mimetype="application/json")
 
 def sets_by_feedslug(request, req_feedslug):
     # TODO: validate req_feedslug
     feed = PicFeed.objects.filter(shortname=req_feedslug)
     sets = PicSet.objects.filter(feed=feed)
-    json_serializer = JSONSerializer()
-    json_serializer.serialize(sets)
-    return HttpResponse(json_serializer.getvalue(), mimetype="application/json")
+    return HttpResponse(json.dumps({'list': [s.serializable() for s in sets]}, indent=2), mimetype="application/json")
 
 def pics_by_set(request, req_picset):
     # TODO: validate req_picset
     pics = Pic.objects.filter(set=req_picset)
-    json_serializer = JSONSerializer()
-    json_serializer.serialize(pics)
-    return HttpResponse(json_serializer.getvalue(), mimetype="application/json")
+    return HttpResponse(json.dumps({'list':[p.serializable() for p in pics]}, indent=2), mimetype="application/json")
 
-- 
cgit v1.2.3