archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Slightly nicer return value & dict creation.

Browse Source
This commit is contained in:
Sybren A. Stüvel
2018-01-05 14:21:16 +01:00
parent 4381ed6671
commit bbdb731043
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pillar/celery/search_index_tasks.py
View File

@@ -66,7 +66,9 @@ def _handle_picture(node: dict, to_index: dict):
def prepare_node_data(node_id: str, node: dict=None) -> dict: def prepare_node_data(node_id: str, node: dict=None) -> dict:
""" """
Given node by id or actual node build data object with fields to index Given node by id or actual node build data object with fields to index.
Returns an empty dict when the node shouldn't be indexed.
""" """
if node_id and node: if node_id and node:
@@ -77,13 +79,13 @@ def prepare_node_data(node_id: str, node: dict=None) -> dict:
if node is None: if node is None:
log.warning('Unable to find node %s, not updating.', node_id) log.warning('Unable to find node %s, not updating.', node_id)
return return {}
if node['node_type'] not in INDEX_ALLOWED_NODE_TYPES: if node['node_type'] not in INDEX_ALLOWED_NODE_TYPES:
return return {}
# If a nodes does not have status published, do not index # If a nodes does not have status published, do not index
if node['properties'].get('status') != 'published': if node['properties'].get('status') != 'published':
return return {}
projects_collection = current_app.data.driver.db['projects'] projects_collection = current_app.data.driver.db['projects']
project = projects_collection.find_one({'_id': ObjectId(node['project'])}) project = projects_collection.find_one({'_id': ObjectId(node['project'])})
@@ -105,10 +107,9 @@ def prepare_node_data(node_id: str, node: dict=None) -> dict:
'_id': user['_id'], '_id': user['_id'],
'full_name': user['full_name'] 'full_name': user['full_name']
}, },
'description': node.get('description'),
} }
to_index['description'] = node.get('description')
_handle_picture(node, to_index) _handle_picture(node, to_index)
# If the node has world permissions, compute the Free permission # If the node has world permissions, compute the Free permission