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 social

Browse source 
* master:
  Handling duplicate feed saving much more gracefully by finding the correct dupe.

Conflicts:
	media/js/newsblur/common/assetmodel.js
This commit is contained in:
Samuel Clay 2012-02-03 16:42:17 -08:00
commit e75281b4e4
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/rss_feeds/models.py
View file

@ -146,15 +146,19 @@ class Feed(models.Model):
super(Feed, self).save(*args, **kwargs)
return self
except IntegrityError, e:
duplicate_feed = Feed.objects.filter(feed_address=self.feed_address)
duplicate_feed = Feed.objects.filter(feed_address=self.feed_address, feed_link=self.feed_link)
logging.debug("%s: %s" % (self.feed_address, duplicate_feed))
logging.debug(' ***> [%-30s] Feed deleted. Could not save: %s' % (unicode(self)[:30], e))
if duplicate_feed:
if duplicate_feeds:
merge_feeds(self.pk, duplicate_feed[0].pk)
return duplicate_feed[0]
# Feed has been deleted. Just ignore it.
return
@classmethod
def merge_feeds(cls, *args, **kwargs):
merge_feeds(*args, **kwargs)
@property
def favicon_fetching(self):
return bool(not (self.favicon_not_found or self.favicon_color))