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

Small refactor on names and amalgamated methods.

Browse source
This commit is contained in:
Samuel Clay 2010-08-23 09:55:21 -04:00
parent 8cfb6a0be9
commit fc16a1b8a9
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/rss_feeds/models.py
View file

@ -18,11 +18,9 @@ from utils.feed_functions import levenshtein_distance
from utils.story_functions import format_story_link_date__short from utils.story_functions import format_story_link_date__short
from utils.story_functions import format_story_link_date__long from utils.story_functions import format_story_link_date__long
from utils.story_functions import pre_process_story from utils.story_functions import pre_process_story
from utils.compressed_textfield import CompressedTextField, StoryField from utils.compressed_textfield import StoryField
from utils.diff import HTMLDiff from utils.diff import HTMLDiff
USER_AGENT = 'NewsBlur v1.0 - newsblur.com'
ENTRY_NEW, ENTRY_UPDATED, ENTRY_SAME, ENTRY_ERR = range(4) ENTRY_NEW, ENTRY_UPDATED, ENTRY_SAME, ENTRY_ERR = range(4)
class Feed(models.Model): class Feed(models.Model):
@ -64,6 +62,12 @@ class Feed(models.Model):
lock.release() lock.release()
else: else:
super(Feed, self).save(*args, **kwargs) super(Feed, self).save(*args, **kwargs)
def update_all_statistics(self, lock=None):
self.count_subscribers(lock=lock)
self.count_stories(lock=lock)
self.save_popular_authors(lock=lock)
self.save_popular_tags(lock=lock)
def save_feed_history(self, status_code, message, exception=None): def save_feed_history(self, status_code, message, exception=None):
FeedFetchHistory.objects.create(feed=self, FeedFetchHistory.objects.create(feed=self,
@ -119,18 +123,24 @@ class Feed(models.Model):
), ),
def count_stories(self, verbose=False, lock=None): def count_stories(self, verbose=False, lock=None):
self.save_feed_stories_last_month(verbose, lock)
self.save_feed_story_history(lock)
def save_feed_stories_last_month(self, verbose=False, lock=None):
month_ago = datetime.datetime.now() - datetime.timedelta(days=30) month_ago = datetime.datetime.now() - datetime.timedelta(days=30)
stories_last_month = MStory.objects(story_feed_id=self.pk, story_date__gte=month_ago).count() stories_last_month = MStory.objects(story_feed_id=self.pk,
story_date__gte=month_ago).count()
self.stories_last_month = stories_last_month self.stories_last_month = stories_last_month
# self.recount_feed(lock) # self.save_feed_story_history(lock)
self.save(lock=lock) self.save(lock=lock)
if verbose: if verbose:
print " ---> %s [%s]: %s stories" % (self.feed_title, self.pk, self.stories_last_month) print " ---> %s [%s]: %s stories last month" % (self.feed_title, self.pk,
self.stories_last_month)
def recount_feed(self, lock=None): def save_feed_story_history(self, lock=None):
""" """
Fills in missing months between earlier occurances and now. Fills in missing months between earlier occurances and now.

6
utils/feed_fetcher.py
View file

@ -192,10 +192,7 @@ class ProcessFeed:
# ).order_by('-story_date') # ).order_by('-story_date')
ret_values = self.feed.add_update_stories(self.fpf.entries, existing_stories, self.db) ret_values = self.feed.add_update_stories(self.fpf.entries, existing_stories, self.db)
self.feed.count_subscribers(lock=self.lock) self.feed.update_all_statistics(lock=self.lock)
self.feed.count_stories(lock=self.lock)
self.feed.save_popular_authors(lock=self.lock)
self.feed.save_popular_tags(lock=self.lock)
self.feed.save_feed_history(200, "OK") self.feed.save_feed_history(200, "OK")
return FEED_OK, ret_values return FEED_OK, ret_values
@ -232,7 +229,6 @@ class Dispatcher:
self.time_start = datetime.datetime.now() self.time_start = datetime.datetime.now()
self.workers = [] self.workers = []
def process_feed_wrapper(self, feed_queue): def process_feed_wrapper(self, feed_queue):
""" wrapper for ProcessFeed """ wrapper for ProcessFeed
""" """