From 07e335b5a5c2a69f9effdda9fa6d1f6273802aca Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Sun, 19 Jul 2009 20:03:35 +0000
Subject: [PATCH] Exposing even more processes over ajax. Quite a bit of
 inspection going on here.

---
 apps/reader/views.py            |  7 ++++---
 media/css/reader.css            | 13 +++++++------
 media/js/newsblur/assetmodel.js | 16 ++++++++++------
 settings.py                     |  2 +-
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/apps/reader/views.py b/apps/reader/views.py
index 57fd4ce95..1266d2a3c 100644
--- a/apps/reader/views.py
+++ b/apps/reader/views.py
@@ -71,13 +71,14 @@ def refresh_feeds(feeds, force=False):
 def load_feeds(request):
     user = get_user(request)
         
-    us =    UserSubscriptionFolders.objects.filter(
+    us =    UserSubscriptionFolders.objects.select_related('feed', 'usersubscription').filter(
                 user=user
             )
-
+    logging.info('UserSubs: %s' % us)
     feeds = []
     folders = []
     for sub in us:
+        logging.info("UserSub: %s" % sub)
         try:
             sub.feed.unread_count = sub.user_sub.count_unread()
         except:
@@ -101,7 +102,7 @@ def load_feeds(request):
     context = feeds
     
     data = json_encode(context)
-    return HttpResponse(data, mimetype='application/json')
+    return HttpResponse(data, mimetype='text/html')
 
 def load_single_feed(request):
     user = get_user(request)
diff --git a/media/css/reader.css b/media/css/reader.css
index 076923624..8c87212a5 100644
--- a/media/css/reader.css
+++ b/media/css/reader.css
@@ -171,6 +171,13 @@ a img {
     display: block;
     padding: 4px 0px;
 }
+
+#story_titles .story .story_title .NB-storytitles-author {
+    padding-left: 12px;
+    color: #808080;
+    font-size: 9px;
+}
+
 #story_titles .story .story_id {
     display: none;
 }
@@ -282,12 +289,6 @@ a img {
     border-top: 4px solid #404040;
 }
 
-#story_pane .story_title .NB-storytitles-author {
-    padding-left: 4px;
-    color: #808080;
-    font-size: 12px;
-}
-
 #story_pane .story_title a {
     text-decoration: none;
     color: #101050;
diff --git a/media/js/newsblur/assetmodel.js b/media/js/newsblur/assetmodel.js
index d27608aed..8d351cbe9 100644
--- a/media/js/newsblur/assetmodel.js
+++ b/media/js/newsblur/assetmodel.js
@@ -41,16 +41,20 @@ NEWSBLUR.AssetModel.Reader.prototype = {
             type: 'POST',
             success: function(o) {
                 var log_regex = /\s+<div id="django_log"([\s|\S])*$/m;
-                var log = o.match(log_regex);
-                var data = eval('(' + o.replace(log_regex, '') + ')');
+                var log_index = o.indexOf('<div id="django_log"');
+                var log = o.substring(log_index);
+                var raw_data = o.substring(0, log_index);
+                var data = eval('(' + raw_data + ')');
                 if(callback && typeof callback == 'function'){
                     callback(data);
                 }
-                if (log && log.length) {
-                    var log_js = log[0].match(/<script.*?>([\s|\S]*?)<\/script>/m);
-                    var log_html = log[0].replace(/<script.*?>[\s|\S]*?<\/script>/m, '');
+                if (log) {
+                    var log_js_index_begin = log.indexOf('<script type="text/javascript">');
+                    var log_js_index_end = log.indexOf('</script>');
+                    var log_html = log.substring(0, log_js_index_begin);
+                    var log_js = log.substring(log_js_index_begin+31, log_js_index_end);
                     $('#django_log').replaceWith(log_html);
-                    var js = eval(log_js[1]);
+                    var js = eval(log_js);
                 }
             }
         });    
diff --git a/settings.py b/settings.py
index cb27643e9..bba26e4eb 100644
--- a/settings.py
+++ b/settings.py
@@ -73,7 +73,7 @@ else:
         '/Users/conesus/Projects/newsblur/templates'
     )
     DEBUG = True
-    CACHE_BACKEND = 'locmem:///'
+    CACHE_BACKEND = 'dummy:///'
     logging.basicConfig(level=logging.DEBUG,
                     format='%(asctime)s %(levelname)s %(message)s',
                     filename='/Users/conesus/Projects/newsblur/logs/newsblur.log',