#3 #15

ChriD · Apr 13, 2017 · 5f14df1 · 5f14df1
1 parent 2a76a3a
commit 5f14df1
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 6 deletions.
diff --git a/lib/requestHandlers/lib.request.getDeviceSettings.js b/lib/requestHandlers/lib.request.getDeviceSettings.js
@@ -0,0 +1,44 @@
+'use strict'; 
+var RequestMediaRenderer = require('../lib.base.requestMediaRenderer');
+
+module.exports = class Request_GetDeviceSettings extends RequestMediaRenderer
+{
+    constructor()
+    {
+        super();
+    }
+
+
+    isAllowedForRoomRenderer()
+    {
+        return true;
+    }
+
+    isAllowedForVirtualRenderer()
+    {
+        return false;
+    }
+
+    isRoomScope()
+    {
+       return true;
+    }
+
+
+    runAction(_resolve, _reject, _mediaRendererVirtual, _mediaRendererRoom, _roomUdn)
+    {
+        if(!_mediaRendererRoom)
+            _reject(new Error("This request needs a room identifier!"));
+
+        var key = this.getQueryValue("key", "");
+
+        if(!key)
+            _reject(new Error("This request needs a key option"));
+
+        _mediaRendererRoom.getDeviceSettings(key, value).then(function(_data){
+                _resolve(_data);
+            }).catch(function(_data){
+                _reject(_data);
+            });
+    }
+}
diff --git a/lib/requestHandlers/lib.request.getRendererState.js b/lib/requestHandlers/lib.request.getRendererState.js
@@ -56,7 +56,7 @@ module.exports = class Request_GetRendererState extends RequestLongPolling
             }
             else
             {
-                // TODO: only add renderers to list which state has been updated??? of course only wehn updateId is given?!
+                // TODO: only add renderers to list which state has been updated??? of course only when updateId is given?!
                 // TODO: Add all other renderers too? when set?
                 var dataArray = [];
                 for (var udn of this.managerDisposer.deviceManager.mediaRenderersVirtual.keys())
@@ -77,10 +77,6 @@ module.exports = class Request_GetRendererState extends RequestLongPolling
                     }
                 }
                  _resolve(dataArray);
-
-                // TOO: @@@
-                //this.logError("Not implemented yet!");
-                //_reject(new Error("Not implemented yet!"));  
             }
         }
         catch(_exception)
@@ -141,6 +137,8 @@ module.exports = class Request_GetRendererState extends RequestLongPolling
         {
             newStateObject.rooms.push(_rendererState.rooms[udn]);
         }
+        // add current media item
+        newStateObject["mediaItem"] = _mediaRenderer.currentMediaItemData;
 
         return newStateObject;
     }

diff --git a/lib/requestHandlers/lib.request.setDeviceSettings.js b/lib/requestHandlers/lib.request.setDeviceSettings.js
@@ -0,0 +1,45 @@
+'use strict'; 
+var RequestMediaRenderer = require('../lib.base.requestMediaRenderer');
+
+module.exports = class Request_SetDeviceSettings extends RequestMediaRenderer
+{
+    constructor()
+    {
+        super();
+    }
+
+
+    isAllowedForRoomRenderer()
+    {
+        return true;
+    }
+
+    isAllowedForVirtualRenderer()
+    {
+        return false;
+    }
+
+    isRoomScope()
+    {
+       return true;
+    }
+
+
+    runAction(_resolve, _reject, _mediaRendererVirtual, _mediaRendererRoom, _roomUdn)
+    {
+        if(!_mediaRendererRoom)
+            _reject(new Error("This request needs a room identifier!"));
+
+        var key = this.getQueryValue("key", "");
+        var value = this.getQueryValue("value", "");
+
+        if(!key || !value)
+            _reject(new Error("This request needs a key and a value option"));
+
+        _mediaRendererRoom.setDeviceSettings(key, value).then(function(_data){
+                _resolve(_data);
+            }).catch(function(_data){
+                _reject(_data);
+            });
+    }
+}
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "raumfeld"
   ],
   "dependencies": {    
-    "node-raumkernel": "^1.0.24"
+    "node-raumkernel": "^1.1.1"
   },
   "author": "Christian Dürnberger",
   "bugs": {