Using the number of subscribers as a base from which to find feeds.

adamjernst · Apr 26, 2011 · d055180 · d055180
1 parent cc94f3f
commit d055180
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py
@@ -129,13 +129,13 @@ def criteria(key, value):
                 return {'%s' % key: value}
 
         def by_url(address):
-            feed = cls.objects.filter(**criteria('feed_address', address))
+            feed = cls.objects.filter(**criteria('feed_address', address)).order_by('-num_subscribers')
             if not feed:
-                duplicate_feed = DuplicateFeed.objects.filter(**criteria('duplicate_address', address)).order_by('pk')
+                feed = cls.objects.filter(**criteria('feed_link', address)).order_by('-num_subscribers')
+            if not feed:
+                duplicate_feed = DuplicateFeed.objects.filter(**criteria('duplicate_address', address))
                 if duplicate_feed and len(duplicate_feed) > offset:
                     feed = [duplicate_feed[offset].feed]
-            if not feed:
-                feed = cls.objects.filter(**criteria('feed_link', address))
 
             return feed