From a15c026f2f5503ca80ed47881c5bf102d5bf28b0 Mon Sep 17 00:00:00 2001
From: S'pht'Kr <sphtkr@icloud.com>
Date: Wed, 7 Oct 2015 06:59:04 +0200
Subject: [PATCH] Manual address specification working now

---
 platforms/YamahaAVR.js | 54 +++++++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/platforms/YamahaAVR.js b/platforms/YamahaAVR.js
index 1659c0f..f08fa96 100644
--- a/platforms/YamahaAVR.js
+++ b/platforms/YamahaAVR.js
@@ -23,6 +23,7 @@ function YamahaAVRPlatform(log, config){
     this.setMainInputTo = config["setMainInputTo"];
     this.expectedDevices = config["expected_devices"] || 100;
     this.discoveryTimeout = config["discovery_timeout"] || 30;
+    this.manualAddresses = config["manual_addresses"] || {};
     this.browser = mdns.createBrowser(mdns.tcp('http'), {resolverSequence: sequence});
 }
 
@@ -75,25 +76,44 @@ YamahaAVRPlatform.prototype = {
         var accessories = [];
         var timer, timeElapsed = 0, checkCyclePeriod = 5000;
         
-        browser.on('serviceUp', function(service){
+        // Hmm... seems we need to prevent double-listing via manual and Bonjour...
+        var sysIds = {};
+        
+        var setupFromService = function(service){
             var name = service.name;
             //console.log('Found HTTP service "' + name + '"');
             // We can't tell just from mdns if this is an AVR...
             if (service.port != 80) return; // yamaha-nodejs assumes this, so finding one on another port wouldn't do any good anyway.
             var yamaha = new Yamaha(service.host);
-            yamaha.getSystemConfig().then(function(sysConfig){
-                var sysModel = sysConfig.YAMAHA_AV.System[0].Config[0].Model_Name[0];
-                var sysId = sysConfig.YAMAHA_AV.System[0].Config[0].System_ID[0];
-                that.log("Found Yamaha " + sysModel + " - " + sysId + ", \"" + name + "\"");
-                var accessory = new YamahaAVRAccessory(that.log, that.config, service, yamaha, sysConfig);
-                accessories.push(accessory);
-                if(accessories.length >= this.expectedDevices)
-                    timeoutFunction(); // We're done, call the timeout function now.
-                //callback([accessory]);
-            }, function(err){
-                return;
+            yamaha.getSystemConfig().then(
+                function(sysConfig){
+                    var sysModel = sysConfig.YAMAHA_AV.System[0].Config[0].Model_Name[0];
+                    var sysId = sysConfig.YAMAHA_AV.System[0].Config[0].System_ID[0];
+                    if(sysIds[sysId]){
+                        this.log("WARN: Got multiple systems with ID " + sysId + "! Omitting duplicate!");
+                        return;
+                    }
+                    sysIds[sysId] = true;
+                    this.log("Found Yamaha " + sysModel + " - " + sysId + ", \"" + name + "\"");
+                    var accessory = new YamahaAVRAccessory(this.log, this.config, name, yamaha, sysConfig);
+                    accessories.push(accessory);
+                    if(accessories.length >= this.expectedDevices)
+                        timeoutFunction(); // We're done, call the timeout function now.
+                }.bind(this)
+            );
+        }.bind(this);
+        
+        // process manually specified devices...
+        for(var key in this.manualAddresses){
+            if(!this.manualAddresses.hasOwnProperty(key)) continue;
+            setupFromService({
+                name: key,
+                host: this.manualAddresses[key],
+                port: 80
             });
-        });       
+        }
+        
+        browser.on('serviceUp', setupFromService);
         browser.start();
         
         // The callback can only be called once...so we'll have to find as many as we can
@@ -119,15 +139,15 @@ YamahaAVRPlatform.prototype = {
     }
 };
 
-function YamahaAVRAccessory(log, config, mdnsService, yamaha, sysConfig) {
+function YamahaAVRAccessory(log, config, name, yamaha, sysConfig) {
     this.log = log;
     this.config = config;
-    this.mdnsService = mdnsService;
     this.yamaha = yamaha;
     this.sysConfig = sysConfig;
     
-    this.name = mdnsService.name;
-    this.serviceName = mdnsService.name + " Speakers";
+    this.nameSuffix = config["name_suffix"] || " Speakers";
+    this.name = name;
+    this.serviceName = name + this.nameSuffix;
     this.setMainInputTo = config["setMainInputTo"];
     this.playVolume = this.config["play_volume"];
     this.minVolume = config["min_volume"] || -50.0;