Bumping version to 1.5.17

forki · Aug 21, 2019 · 45b1612 · 45b1612
1 parent aa2fe7f
commit 45b1612
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 24 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,6 @@
 # Release Notes
 
-## 1.5.16 - 2019-08-21
+## 1.5.17 - 2019-08-21
 * Sonos support
 * Removed Youtube
 

diff --git a/src/Client/ReleaseNotes.fs b/src/Client/ReleaseNotes.fs
@@ -1,13 +1,13 @@
 module internal ReleaseNotes
 
-let Version = "1.5.16"
+let Version = "1.5.17"
 
 let IsPrerelease = false
 
 let Notes = """
 # Release Notes
 
-## 1.5.16 - 2019-08-21
+## 1.5.17 - 2019-08-21
 * Sonos support
 * Removed Youtube
 

diff --git a/src/PiServer/PiServer.fs b/src/PiServer/PiServer.fs
@@ -155,7 +155,7 @@ let previousFile (model:Model,token:string) = task {
 
 let getStartupAction (model:Model) = task {
     use webClient = new System.Net.WebClient()
-    let url = sprintf @"%s/api/startup" model.TagServer
+    let url = sprintf @"%s/api/startup/%s" model.TagServer model.UserID
     let! result = webClient.DownloadStringTaskAsync(System.Uri url)
 
     match Decode.fromString (TagActionForBox.Decoder) result with

diff --git a/src/Server/Server.fs b/src/Server/Server.fs
@@ -241,18 +241,33 @@ let historyEndPoint userID =
         })
     }
 
-let startupEndpoint =
+let startupEndpoint userID =
     pipeline {
         set_header "Content-Type" "application/json"
         plug (fun next ctx -> task {
-            let! sas = getSASMediaLink "d97cdddb-8a19-4690-8ba5-b8ea43d3641f"
-            let action = TagActionForBox.PlayMusik sas
+            match! AzureTable.getUser userID with
+            | None ->
+                return! Response.notFound ctx userID
+            | Some user ->
+                let! sas = getSASMediaLink "d97cdddb-8a19-4690-8ba5-b8ea43d3641f"
 
-            let txt =
-                action
-                |> TagActionForBox.Encoder
-                |> Encode.toString 0
-            return! setBodyFromString txt next ctx
+                match user.SpeakerType with
+                | SpeakerType.Local ->
+                    let txt =
+                        TagActionForBox.PlayMusik sas
+                        |> TagActionForBox.Encoder
+                        |> Encode.toString 0
+                    return! setBodyFromString txt next ctx
+                | SpeakerType.Sonos ->
+                    let logger = ctx.GetLogger "Startup"
+                    let! session = Sonos.createOrJoinSession logger user.SonosAccessToken Sonos.group
+                    do! Sonos.playURL logger user.SonosAccessToken session "StartupSound" sas "StartupSound"
+
+                    let txt =
+                        TagActionForBox.Ignore
+                        |> TagActionForBox.Encoder
+                        |> Encode.toString 0
+                    return! setBodyFromString txt next ctx
         })
     }
 
@@ -293,7 +308,7 @@ let webApp =
         getf "/api/volumedown/%s" volumeDownEndpoint
         postf "/api/upload/%s" uploadEndpoint
         getf "/api/history/%s" historyEndPoint
-        get "/api/startup" startupEndpoint
+        getf "/api/startup/%s" startupEndpoint
         get "/api/firmware" firmwareEndpoint
         get "/api/latestfirmware" getLatestFirmware
         getf "/api/taghistorysocket/%s" (TagHistorySocket.openSocket tagHistoryBroadcaster)

diff --git a/src/Server/Sonos.fs b/src/Server/Sonos.fs
@@ -90,28 +90,29 @@ let volumeDown (log:ILogger) accessToken group = task {
 }
 
 
-
-let playStream (log:ILogger) accessToken (session:Session) (tag:Tag) position = task {
+let playURL (log:ILogger) accessToken (session:Session) itemID mediaURL description = task {
     let headers = ["Authorization", "Bearer " + accessToken]
     let url = sprintf "https://api.ws.sonos.com/control/api/v1/playbackSessions/%s/playbackSession/loadStreamUrl" session.ID
 
-
-    match tag.Action with
-    | TagAction.PlayMusik stream ->
-        let pos = System.Math.Abs(position % stream.Length)
-        let body = sprintf """{
+    let body = sprintf """{
       "streamUrl": "%s",
       "playOnCompletion": true,
       "stationMetadata": {
         "name": "%s"
       },
       "itemId" : "%s"
-    }"""                stream.[pos] (tag.Object + " - " + tag.Description) tag.Token
+    }"""                mediaURL description itemID
+
 
-        log.LogCritical(body)
+    let! _result = post log url headers body
+    ()
+}
 
-        let! _result = post log url headers body
-        ()
+let playStream (log:ILogger) accessToken (session:Session) (tag:Tag) position = task {
+    match tag.Action with
+    | TagAction.PlayMusik stream ->
+        let pos = System.Math.Abs(position % stream.Length)
+        do! playURL log accessToken session tag.Token stream.[pos] (tag.Object + " - " + tag.Description)
     | _ ->
         log.LogError(sprintf "TagAction %A can't be played on Sonos" tag.Action)
 }