Sonos Broker release version 1.0

spfuu · Feb 18, 2017 · bb68559 · bb68559
1 parent d54c9fd
commit bb68559
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 67 deletions.
diff --git a/README.md b/README.md
@@ -1,42 +1,19 @@
 ## Release
 
-v1.0b7  (2017-02-14)
+v1.0  (2017-02-18)
 
+    -- Attention: cleaned-up configuration file. Please re-configure your Sonos Broker installation
     -- command "transport_actions" to Sonos Broker and Sonos command line tool
         -- this options shows all possible actions for the current track (e.g. Next, Stop, Play ...)
-    -- bug: Spotify Radio was handled as a normal radio station and should be fixed
-
-v1.0b6  (2017-02-05)
-
-    -- some GoogleTTS improvements
     -- command 'nightmode' added (only for supported speakers)
-
-v1.0b5  (2017-01-23)
-
-    --  Attention: cleaned-up configuration file. Please re-configure your Sonos Broker installation
-    --  GoogleTTS: files now stored with md5 sum of tts_language and tts_string to reduce the 
-        filename length
-    --  GoogleTTS: now works in streaning mode per default, no web service is needed.
-    --  GoogleTTS: the local ip address for the streaming url will be detected automatically (by default)
-    --  play_tts: (optional) attribute 'force_stream_mode' (re)-added to Sonos Broker and Command 
-        line tool
-
-v1.0b4  (2017-01-22)
-
+    -- bug: Spotify Radio was handled as a normal radio station and should be fixed
+    -- GoogleTTS improvements
+    -- GoogleTTS: files now stored with md5 sum of tts_language and tts_string to reduce the filename length
+    -- GoogleTTS: now works in streaning mode per default, no web service is needed.
+    -- GoogleTTS: the local ip address for the streaming url will be detected automatically (by default)
+    -- play_tts: (optional) attribute 'force_stream_mode' (re)-added to Sonos Broker and Command line tool
     -- bug: endless loop while trying to play a track from a non-existing url
-
-v1.0b3  (2017-01-19)
-
-    -- much better event based  GoogleTTS handling
-
-v1.0b2  (2017-01-17)
-
     -- bug: wrong path in systemd script
-    -- bug: logging unicode error 
-
-v1.0b1 (2017-01-08)
-
-    -- integrated webservice to serve audio files for the Sonos speakers
     -- bug: the 'volume' of all zone members will now be restored correctly after playing the snippet
     -- command optional parameter 'play' added to command "unjoin"
         -- with 'play' set to true, the prevoiusly played track (before joining a group) will resumed

diff --git a/server.sonos/CHANGES.txt b/server.sonos/CHANGES.txt
@@ -1,41 +1,17 @@
-v1.0b7  (2017-02-14)
+v1.0 (2017-02-18)
 
+    -- Attention: cleaned-up configuration file. Please re-configure your Sonos Broker installation
     -- command "transport_actions" to Sonos Broker and Sonos command line tool
         -- this options shows all possible actions for the current track (e.g. Next, Stop, Play ...)
-    -- bug: Spotify Radio was handled as a normal radio station and should be fixed
-
-
-v1.0b6  (2017-02-05)
-
-    -- some GoogleTTS improvements
     -- command 'nightmode' added (only for supported speakers)
-
-v1.0b5  (2017-01-23)
-
-    --  Attention: cleaned-up configuration file. Please re-configure your Sonos Broker installation
-    --  GoogleTTS: files now stored with md5 sum of tts_language and tts_string to reduce the
-        filename length
-    --  GoogleTTS: now works in streaning mode per default, no web service is needed.
-    --  GoogleTTS: the local ip address for the streaming url will be detected automatically (by default)
-    --  play_tts: (optional) attribute 'force_stream_mode' (re)-added to Sonos Broker and Command
-        line tool
-
-v1.0b4  (2017-01-22)
-
+    -- bug: Spotify Radio was handled as a normal radio station and should be fixed
+    -- GoogleTTS improvements
+    -- GoogleTTS: files now stored with md5 sum of tts_language and tts_string to reduce the filename length
+    -- GoogleTTS: now works in streaning mode per default, no web service is needed.
+    -- GoogleTTS: the local ip address for the streaming url will be detected automatically (by default)
+    -- play_tts: (optional) attribute 'force_stream_mode' (re)-added to Sonos Broker and Command line tool
     -- bug: endless loop while trying to play a track from a non-existing url
-
-v1.0b3  (2017-01-19)
-
-    -- much better event based  GoogleTTS handling
-
-v1.0b2 (2017-01-17)
-
     -- bug: wrong path in systemd script
-    -- bug: logging unicode error
-
-v1.0b1 (2017-01-02)
-
-    -- integrated webservice to serve audio files for the Sonos speakers
     -- bug: the 'volume' of all zone members will now be restored correctly after playing the snippet
     -- command optional parameter 'play' added to command "unjoin"
         -- with 'play' set to true, the prevoiusly played track (before joining a group) will resumed

diff --git a/server.sonos/dist/sonos-broker-1.0.tar.gz b/server.sonos/dist/sonos-broker-1.0.tar.gz
diff --git a/server.sonos/dist/sonos-broker-1.0b7.tar.gz b/server.sonos/dist/sonos-broker-1.0b7.tar.gz
diff --git a/server.sonos/lib_sonos/definitions.py b/server.sonos/lib_sonos/definitions.py
@@ -16,7 +16,7 @@
 ip_pattern = '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$'
 
 VERSION_BUILDSTRING = "v1.0b7 (2017-02-14)"
-VERSION = "1.0b7"
+VERSION = "1.0"
 
 DEFAULT_HOST = '0.0.0.0'
 DEFAULT_PORT = 12900

diff --git a/server.sonos/lib_sonos/sonos_speaker.py b/server.sonos/lib_sonos/sonos_speaker.py
@@ -1361,8 +1361,11 @@ def play_snippet(self, uri, volume=-1, group_command=False, fade_in=False):
                     # to roll back to this when we are done
                     logger.debug("Speech: Taking snapshot")
 
-                    snap = Snapshot(self.soco)
-                    snap.snapshot()
+                    # was GoogleTTS the last track? do not snapshot
+                    last_station = self.radio_station
+                    if last_station.lower() != "google tts":
+                        snap = Snapshot(self.soco)
+                        snap.snapshot()
 
                     # Get the URI and play it
                     logger.debug("Speech: Playing URI %s" % uri)
@@ -1397,7 +1400,10 @@ def play_snippet(self, uri, volume=-1, group_command=False, fade_in=False):
                     logger.debug("Speech: Restoring snapshot")
 
                     # Restore the Sonos device back to it's previous state
-                    snap.restore()
+                    if last_station.lower() != "google tts":
+                        snap.restore()
+                    else:
+                        self.radio_station = ""
 
                     for member in self.zone_members:
                         if member in volumes: