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

Merge branch 'master' of github.com:samuelclay/NewsBlur

Browse source 
* 'master' of github.com:samuelclay/NewsBlur:
  FIXING THE WORST BUG OF MY LIFE -- finally figured out what was causing the story-shows-as-unread bug. Also fixed enclosures on certain types of feeds.
  Fixing menu manage open position to compensate for additional menu items.
  Reducing the amount of work done by feed fetching when there are no new stories.
  Fixing emergency bug around trimming feeds where the cursor is changing. Dammit mongo.
This commit is contained in:
Samuel Clay 2011-12-15 07:34:17 -08:00
commit bbe6d8c029
5 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
apps/rss_feeds/models.py
View file

@ -221,11 +221,12 @@ class Feed(models.Model):
publisher.connection.close()
def update_all_statistics(self):
def update_all_statistics(self, full=True):
self.count_subscribers()
self.count_stories()
self.save_popular_authors()
self.save_popular_tags()
if full:
self.save_popular_authors()
self.save_popular_tags()
def setup_feed_for_premium_subscribers(self):
self.count_subscribers()
@ -770,15 +771,19 @@ class Feed(models.Model):
story_feed_id=self.pk,
).order_by('-story_date')
if stories.count() > trim_cutoff:
if verbose:
print 'Found %s stories in %s. Trimming to %s...' % (stories.count(), self, trim_cutoff)
story_trim_date = stories[trim_cutoff].story_date
logging.debug(' ---> [%-30s] Found %s stories. Trimming to %s...' % (self, stories.count(), trim_cutoff))
try:
story_trim_date = stories[trim_cutoff].story_date
except IndexError, e:
logging.debug(' ***> [%-30s] Error trimming feed: %s' % (self, e))
return
extra_stories = MStory.objects(story_feed_id=self.pk, story_date__lte=story_trim_date)
extra_stories_count = extra_stories.count()
extra_stories.delete()
# print "Deleted stories, %s left." % MStory.objects(story_feed_id=self.pk).count()
userstories = MUserStory.objects(feed_id=self.pk, read_date__lte=story_trim_date)
print "Deleted %s stories, %s left." % (extra_stories_count, MStory.objects(story_feed_id=self.pk).count())
userstories = MUserStory.objects(feed_id=self.pk, story_date__lte=story_trim_date)
if userstories.count():
# print "Found %s user stories. Deleting..." % userstories.count()
print "Found %s user stories. Deleting..." % userstories.count()
userstories.delete()
def get_stories(self, offset=0, limit=25, force=False, slave=False):
@ -869,6 +874,7 @@ class Feed(models.Model):
story_has_changed = False
story_pub_date = story.get('published')
story_published_now = story.get('published_now', False)
story_link = self.get_permalink(story)
start_date = story_pub_date - datetime.timedelta(hours=8)
end_date = story_pub_date + datetime.timedelta(hours=8)
@ -878,23 +884,22 @@ class Feed(models.Model):
# print 'Story pub date: %s %s' % (story_published_now, story_pub_date)
if (story_published_now or
(existing_story_pub_date > start_date and existing_story_pub_date < end_date)):
story_link = self.get_permalink(story)
if isinstance(existing_story.id, unicode):
existing_story.story_guid = existing_story.id
if story.get('guid') and story.get('guid') == existing_story.story_guid:
story_in_system = existing_story
elif story_link == existing_story.story_permalink:
story_in_system = existing_story
# Title distance + content distance, checking if story changed
story_title_difference = levenshtein_distance(story.get('title'),
existing_story.story_title)
if 'story_content_z' in existing_story:
existing_story_content = unicode(zlib.decompress(existing_story.story_content_z))
elif 'story_content' in existing_story:
existing_story_content = existing_story.story_content
else:
existing_story_content = u''
if isinstance(existing_story.id, unicode):
existing_story.story_guid = existing_story.id
if story.get('guid') and story.get('guid') == existing_story.story_guid:
story_in_system = existing_story
# Title distance + content distance, checking if story changed
story_title_difference = levenshtein_distance(story.get('title'),
existing_story.story_title)
seq = difflib.SequenceMatcher(None, story_content, existing_story_content)
@ -918,7 +923,7 @@ class Feed(models.Model):
story_in_system = existing_story
story_has_changed = True
break
if story_in_system:
if story_content != existing_story_content:
story_has_changed = True

2
apps/rss_feeds/views.py
View file

@ -135,7 +135,7 @@ def exception_retry(request):
feed.fetched_once = True
feed.save()
feed = feed.update(force=True, compute_scores=False)
feed = feed.update(force=True, compute_scores=False, verbose=True)
usersub = UserSubscription.objects.get(user=user, feed=feed)
usersub.calculate_feed_scores(silent=False)

2
media/js/newsblur/reader.js
View file

@ -1510,7 +1510,7 @@
var $this = $(this);
// _.defer(function() { $('.NB-hover', $folder).not($this).removeClass('NB-hover'); });
// NEWSBLUR.log(['scroll', $this.scrollTop(), $this.offset(), $this.position()]);
if ($this.offset().top > $(window).height() - 270) {
if ($this.offset().top > $(window).height() - 314) {
$this.addClass('NB-hover-inverse');
}
}

2
utils/feed_fetcher.py
View file

@ -238,7 +238,7 @@ class ProcessFeed:
logging.debug(u' ---> [%-30s] ~FYParsed Feed: new=~FG~SB%s~SN~FY up=~FY~SB%s~SN same=~FY%s err=~FR~SB%s' % (
unicode(self.feed)[:30],
ret_values[ENTRY_NEW], ret_values[ENTRY_UPDATED], ret_values[ENTRY_SAME], ret_values[ENTRY_ERR]))
self.feed.update_all_statistics()
self.feed.update_all_statistics(full=bool(ret_values[ENTRY_NEW]))
self.feed.trim_feed()
self.feed.save_feed_history(200, "OK")

5
utils/story_functions.py
View file

@ -2,6 +2,7 @@ from django.utils.dateformat import DateFormat
import datetime
from django.utils.http import urlquote
from django.conf import settings
from itertools import chain
def story_score(story, bottom_delta=None):
# A) Date - Assumes story is unread and within unread range
@ -75,7 +76,7 @@ def pre_process_story(entry):
entry['story_content'] = entry.get('summary', '')
# Add each media enclosure as a Download link
for media_content in entry.get('media_content', []):
for media_content in chain(entry.get('media_content', []), entry.get('links', [])):
media_url = media_content.get('url', '')
media_type = media_content.get('type', '')
if media_url and media_type and media_url not in entry['story_content']:
@ -89,6 +90,8 @@ def pre_process_story(entry):
}
elif 'image' in media_type and media_url:
entry['story_content'] += """<br><br><img src="%s" />""" % media_url
elif media_content.get('rel') == 'alternative' or 'text' in media_content.get('type'):
continue
entry['story_content'] += """<br><br>
Download %(media_type)s: <a href="%(media_url)s">%(media_url)s</a>""" % {
'media_url': media_url,