mtan93/homebridge
1
0
Fork 0
mirror of https://github.com/mtan93/homebridge.git synced 2026-05-10 22:06:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Using the new getStationsData() api call, the station name is saved to every module name, so we avoid duplicate accessories UUIDs

Browse Source
This commit is contained in:
Patrick
2015-10-27 20:41:24 +01:00
parent 06c7356aef
commit 909900d025
1 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/Netatmo.js
+28 -41
View File
@@ -19,7 +19,7 @@
// //
// The default code for all HomeBridge accessories is 031-45-154. // The default code for all HomeBridge accessories is 031-45-154.
var types = require('hap-nodejs/accessories/types.js'); var types = require("hap-nodejs/accessories/types.js");
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// DECLARE SOME UUIDS WHICH SHOUL BE IN HAP-NODEJS TYPES LIB, BUT ARE NOT YET // DECLARE SOME UUIDS WHICH SHOUL BE IN HAP-NODEJS TYPES LIB, BUT ARE NOT YET
@@ -38,8 +38,8 @@ types.CARBON_DIOXIDE_LEVEL_CTYPE = stPre + "93" + stPost;
types.AIR_QUALITY_CTYPE = stPre + "95" + stPost; types.AIR_QUALITY_CTYPE = stPre + "95" + stPost;
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
var netatmo = require('netatmo'); var netatmo = require("netatmo");
var NodeCache = require( "node-cache" ); var NodeCache = require("node-cache");
function NetAtmoRepository(log, api) { function NetAtmoRepository(log, api) {
this.api = api; this.api = api;
@@ -50,28 +50,36 @@ function NetAtmoRepository(log, api) {
NetAtmoRepository.prototype = { NetAtmoRepository.prototype = {
refresh: function(callback) { refresh: function(callback) {
var datasource = { var datasource = {
devices: {},
modules: {} modules: {}
}; };
var that = this; var that = this;
that.api.getDevicelist(function(err, devices, modules) { that.api.getStationsData(function(err, devices) {
// querying for the device infos and the main module
for (var device of devices) { for (var device of devices) {
device.module_name = device.station_name + " " + device.module_name
that.log("refreshing device " + device._id + " (" + device.module_name + ")"); that.log("refreshing device " + device._id + " (" + device.module_name + ")");
datasource.devices[device._id] = device; datasource.modules[device._id] = device;
}
for (var module of modules) { // querying for the extra modules
that.log("refreshing module " + module._id + " (" + module.module_name + ")"); for (var module of device.modules) {
datasource.modules[module._id] = module; module.module_name = device.station_name + " " + module.module_name
that.log("refreshing device " + module._id + " (" + module.module_name + ")");
datasource.modules[module._id] = module;
}
} }
that.cache.set( "datasource", datasource, 20 ); that.cache.set( "datasource", datasource, 20 );
callback(datasource); callback(datasource);
}); });
}, },
load: function(callback) { load: function(callback) {
var that = this; var that = this;
this.cache.get( "datasource", function( err, datasource ) { this.cache.get( "datasource", function(err, datasource) {
if( !err ){ if(!err) {
if ( datasource == undefined ){ if (datasource == undefined) {
that.refresh(callback); that.refresh(callback);
} else { } else {
callback(datasource) callback(datasource)
@@ -100,16 +108,9 @@ NetatmoPlatform.prototype = {
var foundAccessories = []; var foundAccessories = [];
this.repository.load(function(datasource) { this.repository.load(function(datasource) {
for (var id in datasource.devices) {
var device = datasource.devices[id];
that.log("Adding accessory for device " + id + " (" + device.module_name + ")");
var accessory = new NetatmoAccessory(that.log, that.repository, device._id, null, device);
foundAccessories.push(accessory);
}
for (var id in datasource.modules) { for (var id in datasource.modules) {
var module = datasource.modules[id]; var device = datasource.modules[id];
that.log("Adding accessory for module " + module._id + " (" + module.module_name + ")"); var accessory = new NetatmoAccessory(that.log, that.repository, device);
var accessory = new NetatmoAccessory(that.log, that.repository, module.main_device, module._id, module);
foundAccessories.push(accessory); foundAccessories.push(accessory);
} }
callback(foundAccessories); callback(foundAccessories);
@@ -117,22 +118,12 @@ NetatmoPlatform.prototype = {
} }
} }
function NetatmoAccessory(log, repository, deviceId, moduleId, device) { function NetatmoAccessory(log, repository, device) {
this.log = log; this.log = log;
this.repository = repository; this.repository = repository;
this.deviceId = deviceId; this.deviceId = device._id;
this.moduleId = moduleId; this.name = device.module_name
this.serial = deviceId; this.serial = device._id;
if (moduleId) {
this.serial = moduleId;
}
// add station name to devices to avoid duplicate names
if (device.station_name) {
this.name = device.station_name + " " + device.module_name;
} else {
this.name = device.module_name;
}
this.model = device.type; this.model = device.type;
this.serviceTypes = device.data_type; this.serviceTypes = device.data_type;
@@ -146,11 +137,7 @@ NetatmoAccessory.prototype = {
getData: function(callback) { getData: function(callback) {
var that = this; var that = this;
this.repository.load(function(datasource) { this.repository.load(function(datasource) {
if(that.moduleId) { callback(datasource.modules[that.deviceId]);
callback(datasource.modules[that.moduleId]);
} else {
callback(datasource.devices[that.deviceId]);
}
}); });
}, },