Merge branch 'master' of github.com:samuelclay/NewsBlur into exceptions

apps/feed_import/models.py

@@ -56,6 +56,8 @@ class OPMLImporter(Importer):
                 if not hasattr(feed, 'title'):
                     setattr(feed, 'title', feed.htmlUrl)
                 feed_address = urlnorm.normalize(feed.xmlUrl)
+                if len(feed_address) > 255:
+                    continue
                 feed_link = urlnorm.normalize(feed.htmlUrl)
                 logging.info(' ---> \t%s - %s - %s' % (feed.title, feed_link, feed_address,))
                 feed_data = dict(feed_address=feed_address, feed_link=feed_link, feed_title=feed.title)
@@ -121,6 +123,9 @@ class GoogleReaderImporter(Importer):
             feed_link = urlnorm.normalize(feed_link)
             feed_address = urlnorm.normalize(feed_address)
 
+            if len(feed_address) > 255:
+                return folders
+
             # See if it exists as a duplicate first
             duplicate_feed = DuplicateFeed.objects.filter(duplicate_address=feed_address)
             if duplicate_feed:

apps/rss_feeds/models.py

@@ -733,7 +733,7 @@ class FeedFetchHistory(models.Model):
             self.fetch_date,
             self.status_code,
             self.message,
-            self.exception[:50]
+            self.exception and self.exception[:50]
         )
         
 class PageFetchHistory(models.Model):
@@ -750,7 +750,7 @@ class PageFetchHistory(models.Model):
             self.fetch_date,
             self.status_code,
             self.message,
-            self.exception[:50]
+            self.exception and self.exception[:50]
         )
         
 class DuplicateFeed(models.Model):

templates/reader/feeds.xhtml

@@ -185,6 +185,17 @@
           </div>
         </h5>
       </div>
+      
+      <div class="NB-module NB-module-features">
+        <h5 class="NB-module-header">Important information</h5>
+      
+        <table class="" cellpadding="0" cellspacing="0">
+            <tr class="NB-module-feature NB-module-feature-new">
+              <td class="NB-module-feature-date">Today, August 25th</td>
+              <td class="NB-module-feature-description">I am aware that approximately 20% of all feeds are failing to fetch and parse. The fix will be coming sometime today or tomorrow.</td>
+            </tr>
+        </table>
+      </div>
     {% endif %}
     
     <div class="NB-module NB-module-features">