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

Adding missing folder feeds to USF.

Browse source
This commit is contained in:
Samuel Clay 2013-07-15 12:10:51 -07:00
parent 679195aadd
commit c0b31a58a9
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/reader/models.py
View file

@ -987,11 +987,11 @@ class UserSubscriptionFolders(models.Model):
subs = [us.feed_id for us in
UserSubscription.objects.filter(user=self.user).only('feed')]
missing_feeds = set(all_feeds) - set(subs)
if missing_feeds:
logging.debug(" ---> %s is missing %s feeds. Adding %s..." % (
self.user, len(missing_feeds), missing_feeds))
for feed_id in missing_feeds:
missing_subs = set(all_feeds) - set(subs)
if missing_subs:
logging.debug(" ---> %s is missing %s subs. Adding %s..." % (
self.user, len(missing_subs), missing_subs))
for feed_id in missing_subs:
feed = Feed.get_by_id(feed_id)
if feed:
us, _ = UserSubscription.objects.get_or_create(user=self.user, feed=feed, defaults={
@ -1001,6 +1001,18 @@ class UserSubscriptionFolders(models.Model):
us.needs_unread_recalc = True
us.save()
missing_folder_feeds = set(subs) - set(all_feeds)
if missing_folder_feeds:
user_sub_folders = json.decode(self.folders)
logging.debug(" ---> %s is missing %s folder feeds. Adding %s..." % (
self.user, len(missing_folder_feeds), missing_folder_feeds))
for feed_id in missing_folder_feeds:
feed = Feed.get_by_id(feed_id)
if feed and feed.pk == feed_id:
user_sub_folders = add_object_to_folder(feed_id.pk, "", user_sub_folders)
self.folders = json.encode(user_sub_folders)
self.save()
class Feature(models.Model):
"""