public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing missing dupe stories during merge feeds.

Browse source
This commit is contained in:
Samuel Clay 2012-12-12 15:13:17 -08:00
parent b670acaabf
commit d085035430
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/rss_feeds/models.py
View file

@ -1589,21 +1589,25 @@ def merge_feeds(original_feed_id, duplicate_feed_id, force=False):
if original_feed_id == duplicate_feed_id:
logging.info(" ***> Merging the same feed. Ignoring...")
return
# if original_feed_id > duplicate_feed_id and not force:
# original_feed_id, duplicate_feed_id = duplicate_feed_id, original_feed_id
try:
original_feed = Feed.objects.get(pk=original_feed_id)
duplicate_feed = Feed.objects.get(pk=duplicate_feed_id)
except Feed.DoesNotExist:
logging.info(" ***> Already deleted feed: %s" % duplicate_feed_id)
return
if original_feed.num_subscribers < duplicate_feed.num_subscribers and not force:
original_feed, duplicate_feed = duplicate_feed, original_feed
original_feed_id, duplicate_feed_id = duplicate_feed_id, original_feed_id
logging.info(" ---> Feed: [%s - %s] %s - %s" % (original_feed_id, duplicate_feed_id,
original_feed, original_feed.feed_link))
logging.info(" Orig ++> %s: %s / %s" % (original_feed.pk,
logging.info(" Orig ++> %s: (%s subs) %s / %s" % (original_feed.pk,
original_feed.num_subscribers,
original_feed.feed_address,
original_feed.feed_link))
logging.info(" Dupe --> %s: %s / %s" % (duplicate_feed.pk,
logging.info(" Dupe --> %s: (%s subs) %s / %s" % (duplicate_feed.pk,
duplicate_feed.num_subscribers,
duplicate_feed.feed_address,
duplicate_feed.feed_link))