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

Exclude read stories in score calculations. No need to count what's read.

Browse source
This commit is contained in:
samuelclay 2010-01-27 18:08:07 -05:00
parent efcec910f3
commit 82972d276f
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/reader/models.py
View file

@ -92,14 +92,16 @@ class UserSubscription(models.Model):
date_delta = datetime.datetime.now()-datetime.timedelta(days=DAYS_OF_UNREAD)
if date_delta < self.mark_read_date:
date_delta = self.mark_read_date
# read_stories = UserStory.objects.filter(user=self.user,
# feed=self.feed,
# story__story_date__gte=date_delta)
read_stories = UserStory.objects.filter(user=self.user,
feed=self.feed,
story__story_date__gte=date_delta)
read_stories_ids = [rs.story.id for rs in read_stories]
# print "Read stories: %s " % read_stories.count()
stories_db = Story.objects.filter(story_feed=self.feed,
story_date__gte=date_delta)
# .exclude(id__in=[rs.story.id for rs in read_stories])
story_date__gte=date_delta)\
.exclude(id__in=read_stories_ids)
stories = self.feed.format_stories(stories_db)
# print 'Stories: %s' % stories_db.count()
classifier_feeds = ClassifierFeed.objects.filter(user=self.user, feed=self.feed)
classifier_authors = ClassifierAuthor.objects.filter(user=self.user, feed=self.feed)
classifier_titles = ClassifierTitle.objects.filter(user=self.user, feed=self.feed)

3
apps/rss_feeds/models.py
View file

@ -122,7 +122,8 @@ class Feed(models.Model):
original_content = existing_story.story_original_content
else:
original_content = existing_story.story_content
diff = HTMLDiff(original_content, story_content)
# print 'Type: %s %s' % (type(original_content), type(story_content))
diff = HTMLDiff(unicode(original_content), story_content)
# logging.debug("\t\tDiff: %s %s %s" % diff.getStats())
# logging.debug("\t\tDiff content: %s" % diff.getDiff())
if existing_story.story_title != story.get('title'):