turning a field into an optional one

Author: aaronpowell

src/DotNetDelice.Licensing/Spdx.fs

@@ -1,40 +1,56 @@
-module Spdx
-
-open FSharp.Data
-open System.IO
-
-[<Literal>]
-let private URL = "https://spdx.org/licenses/licenses.json"
-
-type Spdx = JsonProvider<"""{ "licenses": [{
-      "reference": "./MIT.html",
-      "isDeprecatedLicenseId": false,
-      "isFsfLibre": true,
-      "detailsUrl": "http://spdx.org/licenses/MIT.json",
-      "referenceNumber": "201",
-      "name": "MIT License",
-      "licenseId": "MIT",
-      "seeAlso": [
-        "https://opensource.org/licenses/MIT"
-      ],
-      "isOsiApproved": true
-    }] }""">
-
-let private download() = Spdx.AsyncLoad URL
-let private getFileLocation() = Path.Combine(System.Environment.CurrentDirectory, "licenses.json")
-
-let getSpdx refreshFile =
-    async {
-        if refreshFile then
-            if File.Exists(getFileLocation()) then File.Delete <| getFileLocation()
-            let! contents = download()
-            File.WriteAllText(getFileLocation(), contents.ToString())
-            return contents
-        else if not (File.Exists(getFileLocation())) then
-            let! contents = download()
-            File.WriteAllText(getFileLocation(), contents.ToString())
-            return contents
-        else
-            let contents = File.ReadAllText <| getFileLocation()
-            return Spdx.Parse contents
-    }
+module Spdx
+
+open FSharp.Data
+open System.IO
+
+[<Literal>]
+let private URL =
+    "https://spdx.org/licenses/licenses.json"
+
+type Spdx =
+    JsonProvider<"""{ "licenses": [{
+      "reference": "./MIT.html",
+      "isDeprecatedLicenseId": false,
+      "isFsfLibre": true,
+      "detailsUrl": "http://spdx.org/licenses/MIT.json",
+      "referenceNumber": "201",
+      "name": "MIT License",
+      "licenseId": "MIT",
+      "seeAlso": [
+        "https://opensource.org/licenses/MIT"
+      ],
+      "isOsiApproved": true
+    },
+    {
+      "reference": "./MIT.html",
+      "isDeprecatedLicenseId": false,
+      "detailsUrl": "http://spdx.org/licenses/MIT.json",
+      "referenceNumber": "201",
+      "name": "MIT License",
+      "licenseId": "MIT",
+      "seeAlso": [
+        "https://opensource.org/licenses/MIT"
+      ],
+      "isOsiApproved": true
+    }] }""">
+
+let private download () = Spdx.AsyncLoad URL
+
+let private getFileLocation () =
+    Path.Combine(System.Environment.CurrentDirectory, "licenses.json")
+
+let getSpdx refreshFile =
+    async {
+        if refreshFile then
+            if File.Exists(getFileLocation ()) then File.Delete <| getFileLocation ()
+            let! contents = download ()
+            File.WriteAllText(getFileLocation (), contents.ToString())
+            return contents
+        else if not (File.Exists(getFileLocation ())) then
+            let! contents = download ()
+            File.WriteAllText(getFileLocation (), contents.ToString())
+            return contents
+        else
+            let contents = File.ReadAllText <| getFileLocation ()
+            return Spdx.Parse contents
+    }

src/DotNetDelice/Output.fs

@@ -26,8 +26,7 @@ type PrintableLicense =
 let private licensesCodeGen legacyLicensed =
     legacyLicensed
     |> Seq.groupBy (fun l -> l.Url)
-    |> Seq.iter
-        (fun (url, pkgs) ->
+    |> Seq.iter (fun (url, pkgs) ->
         printfn "(\"%s\", { Expression = \"\"; Packages = Map.ofList[%s]})" url.Value
             (pkgs
              |> Seq.map (fun p -> sprintf "(\"%s\", [\"%A\"])" p.Name p.Version)
@@ -36,8 +35,14 @@ let private licensesCodeGen legacyLicensed =
 let getSpdxInfo licenseId =
     async {
         let! spdx = getSpdx false
-        match spdx.Licenses |> Array.tryFind (fun l -> l.LicenseId = licenseId) with
-        | Some spdxInfo -> return (spdxInfo.IsOsiApproved, spdxInfo.IsFsfLibre, spdxInfo.IsDeprecatedLicenseId)
+        match spdx.Licenses
+              |> Array.tryFind (fun l -> l.LicenseId = licenseId) with
+        | Some spdxInfo ->
+            return (spdxInfo.IsOsiApproved,
+                    (match spdxInfo.IsFsfLibre with
+                     | Some b -> b
+                     | None -> false),
+                    spdxInfo.IsDeprecatedLicenseId)
         | None -> return (false, false, false)
     }
     |> Async.RunSynchronously
@@ -78,4 +83,4 @@ let getProjectBreakdown licenses =
             | _ -> None)
         |> Seq.sortBy (fun l -> l.PackageName)
 
-    (unlicensed, projectReferences, licensed, legacyLicensed)
+    (unlicensed, projectReferences, licensed, legacyLicensed)