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

Fixing disappearing stories bug when using oldest or unread filter, since as a story gets read it no longer counts against the unread count, resulting in an off-by-one per read story bug.

Browse source
This commit is contained in:
Samuel Clay 2012-12-06 17:33:56 -08:00
parent a723b79d25
commit 17c4b2e041
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
apps/reader/models.py
View file

@ -107,22 +107,27 @@ class UserSubscription(models.Model):
def get_stories(self, offset=0, limit=6, order='newest', read_filter='all', withscores=False): def get_stories(self, offset=0, limit=6, order='newest', read_filter='all', withscores=False):
r = redis.Redis(connection_pool=settings.REDIS_STORY_POOL) r = redis.Redis(connection_pool=settings.REDIS_STORY_POOL)
ignore_user_stories = False ignore_user_stories = False
stories_key = 'F:%s' % (self.feed_id) stories_key = 'F:%s' % (self.feed_id)
read_stories_key = 'RS:%s:%s' % (self.user_id, self.feed_id) read_stories_key = 'RS:%s:%s' % (self.user_id, self.feed_id)
unread_stories_key = 'U:%s:%s' % (self.user_id, self.feed_id) unread_stories_key = 'U:%s:%s' % (self.user_id, self.feed_id)
if not r.exists(stories_key): unread_ranked_stories_key = 'zU:%s:%s' % (self.user_id, self.feed_id)
print " ---> No stories on feed: %s" % self if offset and not withscores and r.exists(unread_ranked_stories_key):
return [] pass
elif read_filter != 'unread' or not r.exists(read_stories_key):
ignore_user_stories = True
unread_stories_key = stories_key
else: else:
r.sdiffstore(unread_stories_key, stories_key, read_stories_key) r.delete(unread_ranked_stories_key)
sorted_stories_key = 'zF:%s' % (self.feed_id) if not r.exists(stories_key):
unread_ranked_stories_key = 'zU:%s:%s' % (self.user_id, self.feed_id) print " ---> No stories on feed: %s" % self
r.zinterstore(unread_ranked_stories_key, [sorted_stories_key, unread_stories_key]) return []
elif read_filter != 'unread' or not r.exists(read_stories_key):
ignore_user_stories = True
unread_stories_key = stories_key
else:
r.sdiffstore(unread_stories_key, stories_key, read_stories_key)
sorted_stories_key = 'zF:%s' % (self.feed_id)
unread_ranked_stories_key = 'zU:%s:%s' % (self.user_id, self.feed_id)
r.zinterstore(unread_ranked_stories_key, [sorted_stories_key, unread_stories_key])
current_time = int(time.time() + 60*60*24) current_time = int(time.time() + 60*60*24)
if order == 'oldest': if order == 'oldest':
@ -151,8 +156,8 @@ class UserSubscription(models.Model):
len(debug_stories), len(debug_stories),
debug_stories) debug_stories)
story_ids = byscorefunc(unread_ranked_stories_key, min_score, story_ids = byscorefunc(unread_ranked_stories_key, min_score,
max_score, start=offset, num=limit, max_score, start=offset, num=500,
withscores=withscores) withscores=withscores)[:limit]
r.expire(unread_ranked_stories_key, 24*60*60) r.expire(unread_ranked_stories_key, 24*60*60)
if not ignore_user_stories: if not ignore_user_stories:
r.delete(unread_stories_key) r.delete(unread_stories_key)

5
media/ios/NewsBlur_Prefix.pch
View file

@ -1,11 +1,6 @@
//
// Prefix header for all source files of the 'NewsBlur' target in the 'NewsBlur' project
//
#ifdef __OBJC__ #ifdef __OBJC__
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
// #import "TestFlight.h"
#define UIColorFromRGB(rgbValue) [UIColor \ #define UIColorFromRGB(rgbValue) [UIColor \
colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 \ colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 \