public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into circular

Browse source 
* master:
  Adding duplicate feed address+link truncation.
This commit is contained in:
Samuel Clay 2013-05-15 15:40:43 -07:00
commit 21ad2d400e
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/rss_feeds/models.py
View file

@ -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

1
apps/rss_feeds/tasks.py
View file

@ -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)