Psion-fanatic/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

Only include entities associated to enabled plugins or with no plugins in entities.get

Browse source
This commit is contained in:
Fabio Manganiello 2022-05-29 23:59:46 +02:00
parent 30dfdeecb0
commit 89560e7c38
Signed by untrusted user: blacklight
GPG key ID: D90FBA7F76362774
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
platypush/plugins/entities/__init__.py
View file

@ -3,8 +3,10 @@ from threading import Thread
from time import time from time import time
from typing import Optional, Any, Collection, Mapping from typing import Optional, Any, Collection, Mapping
from sqlalchemy import or_
from sqlalchemy.orm import make_transient from sqlalchemy.orm import make_transient
from platypush.config import Config
from platypush.context import get_plugin, get_bus from platypush.context import get_plugin, get_bus
from platypush.entities import Entity, get_plugin_entity_registry, get_entities_registry from platypush.entities import Entity, get_plugin_entity_registry, get_entities_registry
from platypush.message.event.entities import EntityUpdateEvent, EntityDeleteEvent from platypush.message.event.entities import EntityUpdateEvent, EntityDeleteEvent
@ -57,8 +59,18 @@ class EntitiesPlugin(Plugin):
selected_types = entity_types.keys() selected_types = entity_types.keys()
db = self._get_db() db = self._get_db()
enabled_plugins = list(
{
*Config.get_plugins().keys(),
*Config.get_backends().keys(),
}
)
with db.get_session() as session: with db.get_session() as session:
query = session.query(Entity) query = session.query(Entity).filter(
or_(Entity.plugin.in_(enabled_plugins), Entity.plugin.is_(None))
)
if selected_types: if selected_types:
query = query.filter(Entity.type.in_(selected_types)) query = query.filter(Entity.type.in_(selected_types))
if plugins: if plugins: