From c585395413a2506ca5ed241007ae27287e8679a9 Mon Sep 17 00:00:00 2001
From: Johann Richard <189003+johannrichard@users.noreply.github.com>
Date: Sat, 5 Dec 2020 09:29:20 +0100
Subject: [PATCH] feat(platform): consolidate auto-discovery names

- auto-discovered devices use MAC suffix in name;
- if the device (dingz only) has its name set in the Web UI, it will prevail;
- manually added device's name override automatic name too
---
 src/platform.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/platform.ts b/src/platform.ts
index 63f982e..e410b0a 100644
--- a/src/platform.ts
+++ b/src/platform.ts
@@ -382,7 +382,7 @@ export class DingzDaHomebridgePlatform implements DynamicPlatformPlugin {
         }
 
         const deviceInfo: DeviceInfo = {
-          name: info.name ?? name,
+          name: name,
           address: address,
           mac: info.mac.toUpperCase(),
           token: token,
@@ -772,6 +772,7 @@ export class DingzDaHomebridgePlatform implements DynamicPlatformPlugin {
 
       const t: DeviceTypes = msg[6];
       const mac: string = this.byteToHexString(msg.subarray(0, 6));
+      const deviceSuffix: string = mac.substr(6, 6);
 
       if (!this.discovered.has(mac)) {
         switch (t) {
@@ -785,7 +786,7 @@ export class DingzDaHomebridgePlatform implements DynamicPlatformPlugin {
               .execute(() => {
                 this.addMyStromButtonDevice({
                   address: remoteInfo.address,
-                  name: 'Button',
+                  name: `Button ${deviceSuffix}`,
                   token: this.config.globalToken,
                   mac: mac,
                 });
@@ -799,7 +800,7 @@ export class DingzDaHomebridgePlatform implements DynamicPlatformPlugin {
               .execute(() => {
                 this.addMyStromLightbulbDevice({
                   address: remoteInfo.address,
-                  name: 'LED Strip',
+                  name: `LED Strip ${deviceSuffix}`,
                   token: this.config.globalToken,
                 });
               })
@@ -812,7 +813,7 @@ export class DingzDaHomebridgePlatform implements DynamicPlatformPlugin {
               .execute(() => {
                 this.addMyStromLightbulbDevice({
                   address: remoteInfo.address,
-                  name: 'Lightbulb',
+                  name: `Lightbulb ${deviceSuffix}`,
                   token: this.config.globalToken,
                 });
               })
@@ -827,7 +828,7 @@ export class DingzDaHomebridgePlatform implements DynamicPlatformPlugin {
               .execute(() => {
                 this.addMyStromSwitchDevice({
                   address: remoteInfo.address,
-                  name: 'Switch',
+                  name: `Switch ${deviceSuffix}`,
                   token: this.config.globalToken,
                 });
               })
@@ -840,7 +841,7 @@ export class DingzDaHomebridgePlatform implements DynamicPlatformPlugin {
               .execute(() => {
                 this.addMyStromPIRDevice({
                   address: remoteInfo.address,
-                  name: 'Motion Sensor',
+                  name: `Motion Sensor ${deviceSuffix}`,
                   token: this.config.globalToken,
                 });
               })
@@ -853,7 +854,7 @@ export class DingzDaHomebridgePlatform implements DynamicPlatformPlugin {
               .execute(() => {
                 this.addDingzDevice({
                   address: remoteInfo.address,
-                  name: 'dingz',
+                  name: `DINGZ ${deviceSuffix}`,
                   token: this.config.globalToken,
                 });
               })