public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-05 16:58:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Separating flat_folders and flat_folders_with_inactive.

Browse source
This commit is contained in:
Samuel Clay 2016-01-28 16:17:25 -08:00
parent 88f45552e4
commit ae5bca50bb
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/reader/models.py
View file

@ -1291,12 +1291,14 @@ class UserSubscriptionFolders(models.Model):
def flatten_folders(self, feeds=None, inactive_feeds=None): def flatten_folders(self, feeds=None, inactive_feeds=None):
folders = json.decode(self.folders) folders = json.decode(self.folders)
flat_folders = {" ": []} flat_folders = {" ": []}
if feeds and not inactive_feeds:
inactive_feeds = []
def _flatten_folders(items, parent_folder="", depth=0): def _flatten_folders(items, parent_folder="", depth=0):
for item in items: for item in items:
if (isinstance(item, int) and if (isinstance(item, int) and
(((not feeds) or (feeds and item in feeds)) or (not feeds or
((not inactive_feeds) or (inactive_feeds and item in inactive_feeds)))): (item in feeds or item in inactive_feeds))):
if not parent_folder: if not parent_folder:
parent_folder = ' ' parent_folder = ' '
if parent_folder in flat_folders: if parent_folder in flat_folders:

6
apps/reader/views.py
View file

@ -368,8 +368,11 @@ def load_feeds_flat(request):
ScheduleImmediateFetches.apply_async(kwargs=dict(feed_ids=scheduled_feeds, user_id=user.pk)) ScheduleImmediateFetches.apply_async(kwargs=dict(feed_ids=scheduled_feeds, user_id=user.pk))
flat_folders = [] flat_folders = []
flat_folders_with_inactive = []
if folders: if folders:
flat_folders = folders.flatten_folders(feeds=feeds, inactive_feeds=inactive_feeds) flat_folders = folders.flatten_folders(feeds=feeds)
flat_folders_with_inactive = folders.flatten_folders(feeds=feeds,
inactive_feeds=inactive_feeds)
social_params = { social_params = {
'user_id': user.pk, 'user_id': user.pk,
@ -392,6 +395,7 @@ def load_feeds_flat(request):
data = { data = {
"flat_folders": flat_folders, "flat_folders": flat_folders,
"flat_folders_with_inactive": flat_folders_with_inactive,
"feeds": feeds, "feeds": feeds,
"inactive_feeds": inactive_feeds, "inactive_feeds": inactive_feeds,
"social_feeds": social_feeds, "social_feeds": social_feeds,