thomas/lovelace-auto-entities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow globs and regex for device names. Fix #20

Browse Source
This commit is contained in:
Thomas Lovén
2019-11-08 08:42:42 +01:00
parent 05a3d0a9c5
commit 65490abff1
4 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/filter.js
View File

@@ -92,16 +92,25 @@ export function entity_filter(hass, filter) {
break;
case "device":
const _deviceEntities = deviceEntities(deviceByName(value));
if(!_deviceEntities.includes(entity.entity_id))
return false;
let _deviceMatch = false;
for(const d of window.cardToolsData.devices) {
if (match(value, d.name)){
if(deviceEntities(d).includes(entity.entity_id))
_deviceMatch = true;
}
}
if(!_deviceMatch) return false;
break;
case "area":
const _areaDevices = areaDevices(areaByName(value));
const _areaEntities = _areaDevices.flatMap(deviceEntities);
if(!_areaEntities.includes(entity.entity_id))
return false;
let _areaMatch = false;
for (const a of window.cardToolsData.areas) {
if(match(value, a.name)) {
if(areaDevices(a).flatMap(deviceEntities).includes(entity.entity_id))
_areaMatch = true;
}
}
if(!_areaMatch) return false;
break;
default:

2
src/main.js
View File

@@ -75,7 +75,7 @@ class AutoEntities extends LitElement {
// Sort everything
entities = entities.sort(entity_sorter(this.hass, this._config.sort));
}
return entities;
}