mirror/min-ed-launcher
3
0
Fork 0
mirror of https://github.com/rfvgyhn/min-ed-launcher.git synced 2026-02-04 13:05:30 +00:00
Code Issues Projects Releases Wiki Activity

fix f# compiler warning FS3511 when building in release mode

Browse Source 
the `if latestExeHash = actualHash then else` expression combined with `match! getProductManifest ...` caused the warning.

https://github.com/dotnet/fsharp/issues/12839
This commit is contained in:
Chris
2025-05-06 00:20:24 -06:00
parent 6c14817325
commit c63bde7e7f
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/MinEdLauncher/Api.fs
View File

@ -352,29 +352,30 @@ let checkForStealthUpdate httpClient (products: Product list) = task {
match p with
| MaybeUpdateMetadata (details, metadata) ->
Log.debug $"Getting manifest for %s{details.Sku}"
match! getProductManifest httpClient metadata.RemotePath with
| Ok manifest ->
let exeEntry =
manifest.Files
|> Array.filter (fun e -> e.Path = details.VInfo.Executable)
|> Array.tryHead
|> Option.teeNone (fun () -> Log.error $"Unable to find %s{details.VInfo.Executable}'s manifest entry")
let latestExeHash = exeEntry |> Option.map _.Hash
let exePath = Path.Combine(details.Directory, details.VInfo.Executable)
let actualHash =
Product.generateFileHashStr Product.hashFile exePath
|> Result.teeError (fun e -> Log.warn $"Unable to get hash of file '%s{exePath}' - %s{e.ToString()}")
|> Option.ofResult
if latestExeHash = actualHash then
return Playable details |> Some
else
let trimmedManifest = new ProductManifest.Manifest(manifest.Title, manifest.Version, [| exeEntry.Value |])
return (details, Some trimmedManifest) |> RequiresStealthUpdate |> Some
| Error msg ->
Log.error $"Failed to get product manifest for %s{details.Name}"
Log.debug msg
return None
let! manifest = getProductManifest httpClient metadata.RemotePath
return
match manifest with
| Ok manifest ->
let exeEntry =
manifest.Files
|> Array.filter (fun e -> e.Path = details.VInfo.Executable)
|> Array.tryHead
|> Option.teeNone (fun () -> Log.error $"Unable to find %s{details.VInfo.Executable}'s manifest entry")
let latestExeHash = exeEntry |> Option.map _.Hash
let exePath = Path.Combine(details.Directory, details.VInfo.Executable)
let actualHash =
Product.generateFileHashStr Product.hashFile exePath
|> Result.teeError (fun e -> Log.warn $"Unable to get hash of file '%s{exePath}' - %s{e.ToString()}")
|> Option.ofResult
if latestExeHash = actualHash then
Playable details |> Some
else
let trimmedManifest = new ProductManifest.Manifest(manifest.Title, manifest.Version, [| exeEntry.Value |])
(details, Some trimmedManifest) |> RequiresStealthUpdate |> Some
| Error msg ->
Log.error $"Failed to get product manifest for %s{details.Name}"
Log.debug msg
None
| _ -> return Some p
})
|> Task.whenAll