mirror of
https://github.com/viq/NewsBlur.git
synced 2025-09-18 21:43:31 +00:00
Hiding Delete Folder so I can get these folder actions shipped. Also improving performance of feed fetcher.
This commit is contained in:
parent
2bd9f72acb
commit
744745b3ee
2 changed files with 8 additions and 15 deletions
|
@ -2287,11 +2287,11 @@
|
|||
$.make('div', { className: 'NB-menu-manage-image' }),
|
||||
$.make('div', { className: 'NB-menu-manage-title' }, 'Mark folder as read')
|
||||
]),
|
||||
$.make('li', { className: 'NB-menu-separator' }),
|
||||
$.make('li', { className: 'NB-menu-manage-feed NB-menu-manage-delete NB-menu-manage-folder-delete' }, [
|
||||
$.make('div', { className: 'NB-menu-manage-image' }),
|
||||
$.make('div', { className: 'NB-menu-manage-title' }, 'Delete this folder')
|
||||
]),
|
||||
// $.make('li', { className: 'NB-menu-separator' }),
|
||||
// $.make('li', { className: 'NB-menu-manage-feed NB-menu-manage-delete NB-menu-manage-folder-delete' }, [
|
||||
// $.make('div', { className: 'NB-menu-manage-image' }),
|
||||
// $.make('div', { className: 'NB-menu-manage-title' }, 'Delete this folder')
|
||||
// ]),
|
||||
$.make('li', { className: 'NB-menu-manage-feed NB-menu-manage-delete-confirm NB-menu-manage-folder-delete-confirm' }, [
|
||||
$.make('div', { className: 'NB-menu-manage-image' }),
|
||||
$.make('div', { className: 'NB-menu-manage-title' }, 'Really delete?')
|
||||
|
|
|
@ -226,16 +226,9 @@ class ProcessFeed:
|
|||
story_guids.append(story.get('guid') or story.get('link'))
|
||||
existing_stories = self.db.stories.find({
|
||||
'story_feed_id': self.feed.pk,
|
||||
'$or': [
|
||||
{
|
||||
'story_date': {'$gte': start_date},
|
||||
'story_date': {'$lte': end_date}
|
||||
},
|
||||
{
|
||||
'story_guid': {'$in': story_guids}
|
||||
}
|
||||
]
|
||||
})
|
||||
'story_date': {'$gte': start_date},
|
||||
'story_guid': {'$in': story_guids}
|
||||
}).limit(len(story_guids))
|
||||
# MStory.objects(
|
||||
# (Q(story_date__gte=start_date) & Q(story_date__lte=end_date))
|
||||
# | (Q(story_guid__in=story_guids)),
|
||||
|
|
Loading…
Add table
Reference in a new issue