Cleaning up tests, reload OPML pane, and minor refactorings for errors.

apps/opml_import/views.py

@@ -10,6 +10,7 @@ from django.contrib.auth.models import User
 from django.http import HttpResponse, HttpRequest
 from django.core import serializers 
 from pprint import pprint
+from django.db import IntegrityError
 import datetime
 
 
@@ -33,23 +34,23 @@ def opml_import(xml_opml, user):
     for folder in outline:
         print folder.text
         for feed in folder:
-            print '.'
+            print '\t%s' % (feed.title,)
             feed_data = dict(feed_address=feed.xmlUrl, feed_link=feed.htmlUrl, feed_title=feed.title)
             feeds.append(feed_data)
             new_feed = Feed(**feed_data)
             try:
                 new_feed.save()
-            except:
+            except IntegrityError:
                 new_feed = Feed.objects.get(**feed_data)
             us = UserSubscription(feed=new_feed, user=user)
             try:
                 us.save()
-            except:
+            except IntegrityError:
                 us = UserSubscription.objects.get(feed=new_feed, user=user)
             user_sub_folder = UserSubscriptionFolders(user=user, feed=new_feed, user_sub=us, folder=folder.text)
             try:
                 user_sub_folder.save()
-            except:
+            except IntegrityError:
                 print 'Can\'t save user_sub_folder'
     data = json_encode(dict(message=message, code=code, payload=dict(feeds=feeds, feed_count=len(feeds))))
     cache.delete('usersub:%s' % user)

apps/rss_feeds/fixtures/rss_feeds.json

@@ -53,7 +53,7 @@
         "pk": 1, 
         "model": "auth.user", 
         "fields": {
-            "username": "conesus", 
+            "username": "test", 
             "first_name": "", 
             "last_name": "", 
             "is_active": 1, 

apps/rss_feeds/tests.py

@@ -1,15 +1,15 @@
-import unittest
 from django.utils import simplejson as json
 from django.test.client import Client
+from django.test import TestCase
 
-class FeedTest(unittest.TestCase):
-    fixtures = ['feeds.json']
+class FeedTest(TestCase):
+    fixtures = ['rss_feeds.json']
     
     def setUp(self):
         self.client = Client()
 
     def test_load_feeds(self):
-        self.client.login(userame='conesus', password='test')
+        self.client.login(userame='test', password='test')
         response = self.client.get('/reader/refresh_feed', { "feed_id": 19, "force": True })
         response = self.client.get('/reader/refresh_feed', { "feed_id": 19, "force": True })
         response = self.client.get('/reader/load_single_feed', { "feed_id": 19 })

media/js/newsblur/reader.js

@@ -228,7 +228,7 @@
             var self = this;
             
             var callback = function() {
-                var $feed_list = self.$feed_list;
+                var $feed_list = self.$feed_list.empty();
                 var folders = self.model.folders;
                 NEWSBLUR.log(['Subscriptions', {'folders':folders}]);
                 for (fo in folders) {
@@ -496,6 +496,8 @@
         },
         
         handle_opml_upload: function() {
+            var self = this;
+            
             NEWSBLUR.log(['Uploading']);
             $.ajaxFileUpload({
 				url: '/opml/opml_upload', 
@@ -509,6 +511,7 @@
 							NEWSBLUR.log(['Success - Error', data.code]);
 						} else {
 							NEWSBLUR.log(['Success', data]);
+							self.load_feeds();
 						}
 					}
 				},

settings.py

@@ -106,7 +106,7 @@ TIME_ZONE = 'America/New_York'
 LANGUAGE_CODE = 'en-us'
 SITE_ID = 1
 USE_I18N = False
-
+LOGIN_REDIRECT_URL = '/'
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".

templates/registration/login.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-
+{{ form.errors }}
 {% if form.errors %}
 <p>Your username and password didn't match. Please try again.</p>
 {% endif %}