Merge pull request #11 from maddox/sonos-improvements

Sonos Improvements

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.1.1] - 2018-04-18
+### Improved
+- Sonos queue is cleared before queuing music.
+
+### Fixed
+- `repeat` and `shuffle` settings for Sonos Actions actually work now.
+
 ## [1.1.0] - 2018-04-17
 ### Added
 - `room` parameter to general config. [Documentation](/docs/install.md#room).

config/actions.example.json

@@ -8,15 +8,15 @@
     "room": "Living Room",
     "playlist": {
       "shuffle": "on",
-      "repeat": "all"
+      "repeat": "on"
     },
     "album": {
       "shuffle": "off",
-      "repeat": "all"
+      "repeat": "off"
     },
     "song": {
       "shuffle": "off",
-      "repeat": "all"
+      "repeat": "on"
     }
   },
   "Home Assistant": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "magic-cards",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "author": "Jon Maddox <jon@jonmaddox.com>",
   "license": "MIT",
   "bugs": {

scanner/actions/SonosAction.js

@@ -6,21 +6,34 @@ class SonosAction extends Action {
   process() {
     const contentConfig = this.config[this.card.type] || {}
 
-    const setRepeat = () => {
-      if (contentConfig.repeat) {
-        this.repeat(contentConfig.repeat)
-      }
+    const request = async () => {
+      await this.setRepeat(contentConfig.repeat)
+      await this.clearQueue()
+      await this.setShuffle(contentConfig.shuffle)
+
+      setTimeout(() => {
+        this.request(this.card.uri)
+      }, 200)
     }
 
-    if (contentConfig.shuffle) {
-      this.shuffle(contentConfig.shuffle)
-        .then(this.queueAndPlay())
-        .then(setRepeat())
-    } else {
-      this.queueAndPlay().then(setRepeat())
+    request()
+  }
+
+  async setShuffle(mode) {
+    if (!mode) {
+      return
     }
+
+    return this.shuffle(mode)
   }
 
+  async setRepeat(mode) {
+    if (!mode) {
+      return
+    }
+
+    return this.repeat(mode)
+  }
   async queueAndPlay() {
     // this.clearQueue()
     // .then(this.request(this.card.uri))
@@ -48,6 +61,8 @@ class SonosAction extends Action {
     const room = encodeURIComponent(this.config.room)
     const baseURL = `http://${this.config.host}:${this.config.port}/${room}/${path}`
 
+    console.log(`Calling: ${baseURL}`)
+
     let headers = {}
     if (this.config.username && this.config.password) {
       headers['Authorization'] =