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

Quick changes to fix issues with new users and their newly subscribed feeds.

Browse source
This commit is contained in:
Samuel Clay 2010-09-23 16:33:06 -04:00
parent 7e5dcb188a
commit 825ca6d407
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/feed_import/models.py
View file

@ -55,7 +55,8 @@ class OPMLImporter(Importer):
for item in outline:
if not hasattr(item, 'xmlUrl'):
folder = item
logging.info(' ---> [%s] New Folder: %s' % (self.user, folder.text))
if hasattr(folder, 'text'):
logging.info(' ---> [%s] New Folder: %s' % (self.user, folder.text))
folders.append({folder.text: self.process_outline(folder)})
elif hasattr(item, 'xmlUrl'):
feed = item
@ -80,6 +81,8 @@ class OPMLImporter(Importer):
if duplicate_feed:
feed_db = duplicate_feed[0].feed
else:
feed_data['active_subscribers'] = 1
feed_data['num_subscribers'] = 1
feed_db, _ = Feed.objects.get_or_create(feed_address=feed_address,
defaults=dict(**feed_data))
@ -145,6 +148,8 @@ class GoogleReaderImporter(Importer):
feed_db = duplicate_feed[0].feed
else:
feed_data = dict(feed_address=feed_address, feed_link=feed_link, feed_title=feed_title)
feed_data['active_subscribers'] = 1
feed_data['num_subscribers'] = 1
feed_db, _ = Feed.objects.get_or_create(feed_address=feed_address,
defaults=dict(**feed_data))

20
apps/reader/models.py
View file

@ -54,8 +54,8 @@ class UserSubscription(models.Model):
def calculate_feed_scores(self, silent=False, stories_db=None):
if self.user.profile.last_seen_on < UNREAD_CUTOFF:
if not silent:
logging.info(' ---> [%s] SKIPPING Computing scores: %s (1 week+)' % (self.user, self.feed))
# if not silent:
# logging.info(' ---> [%s] SKIPPING Computing scores: %s (1 week+)' % (self.user, self.feed))
return
if not self.feed.fetched_once:
@ -79,8 +79,8 @@ class UserSubscription(models.Model):
read_stories = MUserStory.objects(user_id=self.user.pk,
feed_id=self.feed.pk,
read_date__gte=self.mark_read_date)
if not silent:
logging.info(' ---> [%s] Read stories: %s' % (self.user, datetime.datetime.now() - now))
# if not silent:
# logging.info(' ---> [%s] Read stories: %s' % (self.user, datetime.datetime.now() - now))
read_stories_ids = []
for us in read_stories:
if hasattr(us.story, 'story_guid') and isinstance(us.story.story_guid, unicode):
@ -89,8 +89,8 @@ class UserSubscription(models.Model):
read_stories_ids.append(us.story.id) # TODO: Remove me after migration from story.id->guid
stories_db = stories_db or MStory.objects(story_feed_id=self.feed.pk,
story_date__gte=date_delta)
if not silent:
logging.info(' ---> [%s] MStory: %s' % (self.user, datetime.datetime.now() - now))
# if not silent:
# logging.info(' ---> [%s] MStory: %s' % (self.user, datetime.datetime.now() - now))
unread_stories_db = []
for story in stories_db:
if story.story_date < date_delta:
@ -100,16 +100,16 @@ class UserSubscription(models.Model):
elif isinstance(story.id, unicode) and story.id not in read_stories_ids:
unread_stories_db.append(story)
stories = self.feed.format_stories(unread_stories_db)
if not silent:
logging.info(' ---> [%s] Format stories: %s' % (self.user, datetime.datetime.now() - now))
# if not silent:
# logging.info(' ---> [%s] Format stories: %s' % (self.user, datetime.datetime.now() - now))
classifier_feeds = MClassifierFeed.objects(user_id=self.user.pk, feed_id=self.feed.pk)
classifier_authors = MClassifierAuthor.objects(user_id=self.user.pk, feed_id=self.feed.pk)
classifier_titles = MClassifierTitle.objects(user_id=self.user.pk, feed_id=self.feed.pk)
classifier_tags = MClassifierTag.objects(user_id=self.user.pk, feed_id=self.feed.pk)
if not silent:
logging.info(' ---> [%s] Classifiers: %s (%s)' % (self.user, datetime.datetime.now() - now, classifier_feeds.count() + classifier_authors.count() + classifier_tags.count() + classifier_titles.count()))
# if not silent:
# logging.info(' ---> [%s] Classifiers: %s (%s)' % (self.user, datetime.datetime.now() - now, classifier_feeds.count() + classifier_authors.count() + classifier_tags.count() + classifier_titles.count()))
scores = {
'feed': apply_classifier_feeds(classifier_feeds, self.feed),