From c6d7bc2e3ed029a35c330deae46f4f9da98b4bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Victor=20Hagelb=C3=A4ck?= <swevictor@gmail.com>
Date: Mon, 8 Feb 2021 19:55:18 +0100
Subject: [PATCH] Minor updates and fixes

---
 plejd/DeviceRegistry.js      | 2 +-
 plejd/Dockerfile             | 2 +-
 plejd/Logger.js              | 2 +-
 plejd/SceneManager.js        | 8 ++++----
 plejd/test/test.ble.bluez.js | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plejd/DeviceRegistry.js b/plejd/DeviceRegistry.js
index 1a26df4..9cf6ae9 100644
--- a/plejd/DeviceRegistry.js
+++ b/plejd/DeviceRegistry.js
@@ -28,7 +28,7 @@ class DeviceRegistry {
   }
 
   addScene(scene) {
-    this.plejdDevices[scene.id] = scene;
+    this.sceneDevices[scene.id] = scene;
   }
 
   setApiSite(siteDetails) {
diff --git a/plejd/Dockerfile b/plejd/Dockerfile
index b769332..9f558a9 100644
--- a/plejd/Dockerfile
+++ b/plejd/Dockerfile
@@ -16,7 +16,7 @@ COPY ./MqttClient.js /plejd/
 COPY ./package.json /plejd/
 COPY ./PlejdAddon.js /plejd/
 COPY ./PlejdApi.js /plejd/
-COPY ./PlejdBLE.js /plejd/
+COPY ./PlejdBLEHandler.js /plejd/
 COPY ./Scene.js /plejd/
 COPY ./SceneManager.js /plejd/
 COPY ./SceneStep.js /plejd/
diff --git a/plejd/Logger.js b/plejd/Logger.js
index 430d27b..19bf436 100644
--- a/plejd/Logger.js
+++ b/plejd/Logger.js
@@ -32,7 +32,7 @@ class Logger {
   }
 
   static getLogLevel() {
-    const config = Configuration.getConfiguration();
+    const config = Configuration.getOptions();
     // eslint-disable-next-line max-len
     const level = (config.logLevel && LEVELS.find((l) => l.startsWith(config.logLevel[0].toLowerCase())))
       || 'info';
diff --git a/plejd/SceneManager.js b/plejd/SceneManager.js
index b1a02d6..42279cb 100644
--- a/plejd/SceneManager.js
+++ b/plejd/SceneManager.js
@@ -24,14 +24,14 @@ class SceneManager extends EventEmitter {
     this.scenes = {};
     scenes.forEach((scene) => {
       const idx = this.deviceRegistry.apiSite.sceneIndex[scene.sceneId];
-      this.scenes[scene.sceneId] = new Scene(idx, scene, this.deviceRegistry.apiSite.sceneSteps);
+      this.scenes[scene.id] = new Scene(idx, scene, this.deviceRegistry.apiSite.sceneSteps);
     });
   }
 
-  executeScene(sceneIndex) {
-    const scene = this.scenes[sceneIndex];
+  executeScene(sceneId) {
+    const scene = this.scenes[sceneId];
     if (!scene) {
-      logger.info(`Scene with id ${sceneIndex} not found`);
+      logger.info(`Scene with id ${sceneId} not found`);
       logger.verbose(`Scenes: ${JSON.stringify(this.scenes, null, 2)}`);
       return;
     }
diff --git a/plejd/test/test.ble.bluez.js b/plejd/test/test.ble.bluez.js
index 6efed02..acd9022 100644
--- a/plejd/test/test.ble.bluez.js
+++ b/plejd/test/test.ble.bluez.js
@@ -1,4 +1,4 @@
-const PlejdBLE = require('../PlejdBLE');
+const PlejdBLE = require('../PlejdBLEHandler');
 
 const cryptoKey = '';