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

Switching to faster unread counting for socialsubs and usersubs.

Browse source
This commit is contained in:
Samuel Clay 2013-05-14 17:31:08 -07:00
parent bd51fc6abb
commit 9a6e9078c3
4 changed files with 24 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/api/views.py
View file

@ -294,7 +294,7 @@ def share_story(request, token):
socialsub = MSocialSubscription.objects.get(user_id=profile.user.pk,
subscription_user_id=profile.user.pk)
socialsub.mark_story_ids_as_read([shared_story.story_guid],
socialsub.mark_story_ids_as_read([shared_story.story_hash],
shared_story.story_feed_id,
request=request)

19
apps/reader/models.py
View file

@ -3,7 +3,6 @@ import time
import redis
import hashlib
import re
import mongoengine as mongo
from utils import log as logging
from utils import json_functions as json
from django.db import models, IntegrityError
@ -325,8 +324,8 @@ class UserSubscription(models.Model):
return True
def mark_story_ids_as_read(self, story_ids, request=None):
data = dict(code=0, payload=story_ids)
def mark_story_ids_as_read(self, story_hashes, request=None):
data = dict(code=0, payload=story_hashes)
if not request:
request = self.user
@ -335,13 +334,13 @@ class UserSubscription(models.Model):
self.needs_unread_recalc = True
self.save()
if len(story_ids) > 1:
logging.user(request, "~FYRead %s stories in feed: %s" % (len(story_ids), self.feed))
if len(story_hashes) > 1:
logging.user(request, "~FYRead %s stories in feed: %s" % (len(story_hashes), self.feed))
else:
logging.user(request, "~FYRead story in feed: %s" % (self.feed))
for story_id in set(story_ids):
RUserStory.mark_read(self.user_id, self.feed_id, story_id)
for story_hash in set(story_hashes):
RUserStory.mark_read(self.user_id, self.feed_id, story_hash)
return data
@ -460,8 +459,8 @@ class UserSubscription(models.Model):
logging.info(" ===> %s " % self.user)
# Switch read stories
stories = RUserStory.switch_feed(user_id=self.user_id, old_feed_id=old_feed.pk,
new_feed_id=new_feed.pk)
RUserStory.switch_feed(user_id=self.user_id, old_feed_id=old_feed.pk,
new_feed_id=new_feed.pk)
def switch_feed_for_classifier(model):
duplicates = model.objects(feed_id=old_feed.pk, user_id=self.user_id)
@ -487,7 +486,7 @@ class UserSubscription(models.Model):
self.feed = new_feed
self.needs_unread_recalc = True
try:
new_sub = UserSubscription.objects.get(user=self.user, feed=new_feed)
UserSubscription.objects.get(user=self.user, feed=new_feed)
except UserSubscription.DoesNotExist:
self.save()
user_sub_folders.rewrite_feed(new_feed, old_feed)

2
apps/reader/views.py
View file

@ -980,7 +980,7 @@ def mark_story_as_unread(request):
story_date__gte=story.story_date,
story_date__lte=usersub.mark_read_date
).only('story_guid')
newer_stories = [s.story_guid for s in newer_stories]
newer_stories = [s.story_hash for s in newer_stories]
usersub.mark_read_date = story.story_date - datetime.timedelta(minutes=1)
usersub.needs_unread_recalc = True
usersub.save()

38
apps/social/models.py
View file

@ -17,7 +17,6 @@ from django.core.urlresolvers import reverse
from django.template.loader import render_to_string
from django.template.defaultfilters import slugify
from django.core.mail import EmailMultiAlternatives
from django.core.cache import cache
from apps.reader.models import UserSubscription, RUserStory
from apps.analyzer.models import MClassifierFeed, MClassifierAuthor, MClassifierTag, MClassifierTitle
from apps.analyzer.models import apply_classifier_titles, apply_classifier_feeds, apply_classifier_authors, apply_classifier_tags
@ -884,8 +883,8 @@ class MSocialSubscription(mongo.Document):
else:
return [], [], []
def mark_story_ids_as_read(self, story_ids, feed_id=None, mark_all_read=False, request=None):
data = dict(code=0, payload=story_ids)
def mark_story_ids_as_read(self, story_hashes, feed_id=None, mark_all_read=False, request=None):
data = dict(code=0, payload=story_hashes)
r = redis.Redis(connection_pool=settings.REDIS_POOL)
if not request:
@ -897,27 +896,19 @@ class MSocialSubscription(mongo.Document):
sub_username = MSocialProfile.get_user(self.subscription_user_id).username
if len(story_ids) > 1:
logging.user(request, "~FYRead %s stories in social subscription: %s" % (len(story_ids), sub_username))
if len(story_hashes) > 1:
logging.user(request, "~FYRead %s stories in social subscription: %s" % (len(story_hashes), sub_username))
else:
logging.user(request, "~FYRead story in social subscription: %s" % (sub_username))
for story_id in set(story_ids):
try:
story = MSharedStory.objects.get(user_id=self.subscription_user_id,
story_guid=story_id)
except MSharedStory.DoesNotExist:
if settings.DEBUG:
logging.user(request, "~BR~FYCould not find story: %s/%s" %
(self.subscription_user_id, story_id))
continue
feed_id = story.story_feed_id
RUserStory.mark_read(self.user_id, feed_id, story.story_hash)
for story_hash in set(story_hashes):
if not feed_id:
feed_id, _ = RUserStory.split_story_hash(story_hash)
RUserStory.mark_read(self.user_id, feed_id, story_hash)
# Find other social feeds with this story to update their counts
friend_key = "F:%s:F" % (self.user_id)
share_key = "S:%s:%s" % (feed_id, story.guid_hash)
share_key = "S:%s" % (story_hash)
friends_with_shares = [int(f) for f in r.sinter(share_key, friend_key)]
if self.user_id in friends_with_shares:
friends_with_shares.remove(self.user_id)
@ -926,7 +917,7 @@ class MSocialSubscription(mongo.Document):
user_id=self.user_id,
subscription_user_id__in=friends_with_shares)
for socialsub in socialsubs:
if not socialsub.needs_unread_recalc:
if not socialsub.needs_unread_recalc and not mark_all_read:
socialsub.needs_unread_recalc = True
socialsub.save()
@ -959,8 +950,7 @@ class MSocialSubscription(mongo.Document):
story_guid=story_id)
except MSharedStory.DoesNotExist:
continue
now = datetime.datetime.utcnow()
date = now if now > story.story_date else story.story_date # For handling future stories
RUserStory.mark_read(user_id, story.story_feed_id, story.story_hash)
# Also count on original subscription
@ -993,10 +983,8 @@ class MSocialSubscription(mongo.Document):
self.oldest_unread_story_date = latest_story_date
# Manually mark all shared stories as read.
stories = MSharedStory.objects.filter(user_id=self.subscription_user_id,
shared_date__gte=UNREAD_CUTOFF).only('story_guid')
story_ids = [s.story_guid for s in stories]
self.mark_story_ids_as_read(story_ids, mark_all_read=True)
unread_story_hashes = self.get_stories(read_filter='unread', limit=500, hashes_only=True)
self.mark_story_ids_as_read(unread_story_hashes, mark_all_read=True)
self.needs_unread_recalc = False
self.save()