mirror of
https://github.com/viq/NewsBlur.git
synced 2025-09-18 21:43:31 +00:00
Opening the floodgates for proper counting.
This commit is contained in:
parent
2f196f428f
commit
5ed1b06710
3 changed files with 6 additions and 6 deletions
|
@ -97,7 +97,7 @@ class UserSubscription(models.Model):
|
|||
# story__story_date__gte=date_delta)
|
||||
# print "Read stories: %s " % read_stories.count()
|
||||
stories_db = Story.objects.filter(story_feed=self.feed,
|
||||
story_date__gte=date_delta)[:100]
|
||||
story_date__gte=date_delta)
|
||||
# .exclude(id__in=[rs.story.id for rs in read_stories])
|
||||
stories = self.feed.format_stories(stories_db)
|
||||
classifier_feeds = ClassifierFeed.objects.filter(user=self.user, feed=self.feed)
|
||||
|
|
|
@ -182,7 +182,7 @@ class Feed(models.Model):
|
|||
stories_db = Story.objects.filter(story_feed=self)\
|
||||
.select_related('story_author')[offset:offset+limit]
|
||||
stories = self.format_stories(stories_db)
|
||||
cache.set('feed_stories:%s-%s-%s' % (self.id, offset, limit), stories)
|
||||
cache.set('feed_stories:%s-%s-%s' % (self.id, offset, limit), stories, 600)
|
||||
|
||||
return stories
|
||||
|
||||
|
|
|
@ -140,10 +140,10 @@ class ProcessFeed:
|
|||
self.feed.last_modified = mtime(self.fpf.modified)
|
||||
except:
|
||||
pass
|
||||
|
||||
self.feed.feed_title = self.fpf.feed.get('title', '')[0:254]
|
||||
self.feed.feed_tagline = self.fpf.feed.get('tagline', '')
|
||||
self.feed.feed_link = self.fpf.feed.get('link', '')
|
||||
|
||||
self.feed.feed_title = self.fpf.feed.get('title', self.feed.feed_title)
|
||||
self.feed.feed_tagline = self.fpf.feed.get('tagline', self.feed.feed_tagline)
|
||||
self.feed.feed_link = self.fpf.feed.get('link', self.feed.feed_link)
|
||||
self.feed.last_update = datetime.datetime.now()
|
||||
|
||||
if False and self.options['verbose']:
|
||||
|
|
Loading…
Add table
Reference in a new issue