Bumping version to 0.0.27

forki · Oct 5, 2018 · 217be63 · 217be63
1 parent 92195d0
commit 217be63
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 6 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,5 @@
 # Release Notes
 
-## 0.0.26 - 2018-10-05
+## 0.0.27 - 2018-10-05
 
 * Initial release
diff --git a/src/Client/ReleaseNotes.fs b/src/Client/ReleaseNotes.fs
@@ -1,13 +1,13 @@
 module internal ReleaseNotes
 
-let Version = "0.0.26"
+let Version = "0.0.27"
 
 let IsPrerelease = false
 
 let Notes = """
 # Release Notes
 
-## 0.0.26 - 2018-10-05
+## 0.0.27 - 2018-10-05
 
 * Initial release
 """
diff --git a/src/PiServer/PiServer.fs b/src/PiServer/PiServer.fs
@@ -38,11 +38,9 @@ let play (nodeServices : INodeServices) (uri:string) = task {
 let stop (nodeServices : INodeServices) = task {
     if isWindows then
         let! r = nodeServices.InvokeExportAsync<string>("./play-audio", "stop")
-        printfn "Stopped"
         return r
     else
         let! r = nodeServices.InvokeExportAsync<string>("./play-audiostream", "stop")
-        printfn "Stopped"
         return r
 }
 
@@ -77,6 +75,34 @@ let executeTag (nodeServices : INodeServices) (tag:string) = task {
     | Ok tag -> return! executeAction nodeServices tag.Action
 }
 
+let checkFirmware () = task {
+    use webClient = new System.Net.WebClient()
+    System.Net.ServicePointManager.SecurityProtocol <- 
+        System.Net.ServicePointManager.SecurityProtocol ||| 
+          System.Net.SecurityProtocolType.Tls11 |||
+          System.Net.SecurityProtocolType.Tls12
+
+    let url = sprintf @"%s/api/firmware" tagServer
+    let! result = webClient.DownloadStringTaskAsync(System.Uri url)
+
+    match Decode.fromString Firmware.Decoder result with
+    | Error msg -> return failwith msg
+    | Ok firmware ->
+        try
+            if firmware.Version <> ReleaseNotes.Version then
+                let localFileName = System.IO.Path.GetTempFileName().Replace(".tmp", ".zip")
+                printfn "Starting download of %s" firmware.Url
+                do! webClient.DownloadFileTaskAsync(firmware.Url,localFileName)
+                printfn "Download done."
+                System.IO.Compression.ZipFile.ExtractToDirectory(localFileName, System.IO.Path.GetFullPath "./install")
+                System.IO.File.Delete localFileName
+                return Some firmware.Version
+            else
+                return None
+        with
+        | _ -> return None
+}
+
 let executeStartupActions (nodeServices : INodeServices) = task {
     use webClient = new System.Net.WebClient()
     let url = sprintf @"%s/api/startup" tagServer
@@ -114,7 +140,11 @@ let app = application {
 let x = app.Build()
 x.Start()
 
-printfn "Started"
+printfn "Server started"
+
+let firmwareCheck = checkFirmware()
+firmwareCheck.Wait()
+let r = firmwareCheck.Result
 
 let service = x.Services.GetService(typeof<INodeServices>) :?> INodeServices
 

diff --git a/src/PiServer/PiServer.fsproj b/src/PiServer/PiServer.fsproj
@@ -5,6 +5,7 @@
         <TargetFramework>netcoreapp2.1</TargetFramework>
     </PropertyGroup>
     <ItemGroup>
+        <Compile Include="..\Client\ReleaseNotes.fs" />
         <Compile Include="..\Shared\Shared.fs" />
         <Compile Include="PiServer.fs" />
     </ItemGroup>