From f6f053b2858caa8e27fb560c1a2ffa0597990660 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Wed, 15 May 2013 15:40:38 -0700
Subject: [PATCH] Adding duplicate feed address+link truncation.

---
 apps/rss_feeds/models.py | 10 ++++++++++
 apps/rss_feeds/tasks.py  |  1 -
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py
index 0df81cde4..c56de7a9e 100644
--- a/apps/rss_feeds/models.py
+++ b/apps/rss_feeds/models.py
@@ -1877,6 +1877,16 @@ class DuplicateFeed(models.Model):
             'duplicate_feed_id': self.duplicate_feed_id,
             'feed_id': self.feed_id
         }
+    
+    def save(self, *args, **kwargs):
+        max_address = Feed._meta.get_field('duplicate_address').max_length
+        if len(self.duplicate_address) > max_address:
+            self.duplicate_address = self.duplicate_address[:max_address]
+        max_link = Feed._meta.get_field('duplicate_link').max_length
+        if len(self.duplicate_link) > max_link:
+            self.duplicate_link = self.duplicate_link[:max_link]
+            
+        super(Feed, self).save(*args, **kwargs)
 
 def merge_feeds(original_feed_id, duplicate_feed_id, force=False):
     from apps.reader.models import UserSubscription
diff --git a/apps/rss_feeds/tasks.py b/apps/rss_feeds/tasks.py
index 19054c253..7cf0c0235 100644
--- a/apps/rss_feeds/tasks.py
+++ b/apps/rss_feeds/tasks.py
@@ -87,7 +87,6 @@ class TaskFeeds(Task):
             cp4 - cp3
         ))
         
-        # Feed.task_feeds(feeds, verbose=False)
         Feed.task_feeds(refresh_feeds, verbose=False)
         Feed.task_feeds(old_feeds, verbose=False)