dandri/zigbee2mqtt
1
0
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-08-28 23:00:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify settings getters

Browse Source
This commit is contained in:
qm3ster
2019-03-09 16:30:05 +01:00
committed by Koen Kanters
parent c0bdf2e3a2
commit 044e8466ed
1 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/util/settings.js
+16 -30
View File
@@ -143,20 +143,14 @@ function set(path, value) {
writeRead();
}
const getDevice = (ieeeAddr) => {
const settings = getSettings();
return settings.devices ? settings.devices[ieeeAddr] : null;
};
const getDevices = () => getSettings().devices || [];
const getGroup = (ID) => {
const settings = getSettings();
return settings.groups ? settings.groups[ID]: null;
};
const getDevice = (ieeeAddr) => getDevices()[ieeeAddr];
const getGroups = () => getSettings().groups || [];
const getGroup = (ID) => getGroups()[ID];
const getDevices = () => {
const settings = getSettings();
return settings.devices ? settings.devices : [];
};
function addDevice(ieeeAddr) {
const settings = getSettings();
@@ -170,32 +164,24 @@ function addDevice(ieeeAddr) {
function removeDevice(ieeeAddr) {
const settings = getSettings();
if (settings.devices && settings.devices[ieeeAddr]) {
delete settings.devices[ieeeAddr];
writeRead();
}
if (!settings.devices || !settings.devices[ieeeAddr]) return;
delete settings.devices[ieeeAddr];
writeRead();
}
function getIeeeAddrByFriendlyName(friendlyName) {
const settings = getSettings();
if (!settings.devices) {
return null;
}
return Object.keys(settings.devices).find((ieeeAddr) =>
settings.devices[ieeeAddr].friendly_name === friendlyName
const entry = Object.entries(getDevices()).find(([ieeeAddr, device]) =>
device.friendly_name === friendlyName
);
return entry && entry[0];
}
function getGroupIDByFriendlyName(friendlyName) {
const settings = getSettings();
if (!settings.groups) {
return null;
}
return Object.keys(settings.groups).find((ID) =>
settings.groups[ID].friendly_name === friendlyName
const entry = Object.entries(getGroups()).find(([ID, group]) =>
group.friendly_name === friendlyName
);
return entry && entry[0];
}
function changeDeviceOptions(ieeeAddr, newOptions) {