swrup/mte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

JJ: Description from the destination commit:

Browse source 
change to let*?

JJ: Description from source commit:
.
This commit is contained in:
swrup 2025-11-03 08:46:29 +01:00
parent 9440812f12
commit 8c07df1de4
1 changed files with 36 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

65
unikernel/unikernel.ml
View file

@ -44,28 +44,17 @@ struct
module Assets = struct module Assets = struct
module Assets_ro = Keys_ro module Assets_ro = Keys_ro
let ( let*$ ) = Lwt_result.bind let ( let*? ) = Lwt_result.bind
let ( let+? ) x f = Lwt_result.map f x
let map_err_to_string = map_err_to_string Assets_ro.pp_error let map_err_to_string = map_err_to_string Assets_ro.pp_error
let get_dir l name =
l
|> List.find_opt (fun (k, t) ->
Mirage_kv.Key.(equal (v name) k) && t = `Dictionary)
|> Option.map fst
|> Option.to_result ~none:(`Msg (Fmt.str "missing `%s` directory" name))
|> Lwt_result.lift
let get_subdirs ro k = let get_subdirs ro k =
let*$ keys = Assets_ro.list ro k |> map_err_to_string in let+? keys = Assets_ro.list ro k |> map_err_to_string in
List.filter (fun (_, t) -> t = `Dictionary) keys List.filter (fun (_, t) -> t = `Dictionary) keys |> List.map fst
|> List.map fst
|> Lwt_result.return
let get_values ro k = let get_values ro k =
let*$ keys = Assets_ro.list ro k |> map_err_to_string in let+? keys = Assets_ro.list ro k |> map_err_to_string in
List.filter (fun (_, t) -> t = `Value) keys List.filter (fun (_, t) -> t = `Value) keys |> List.map fst
|> List.map fst
|> Lwt_result.return
let find keys name = let find keys name =
keys keys
@ -73,19 +62,37 @@ struct
|> Option.to_result ~none:(`Msg (Fmt.str "missing `%s` directory" name)) |> Option.to_result ~none:(`Msg (Fmt.str "missing `%s` directory" name))
|> Lwt_result.lift |> Lwt_result.lift
let lwt_list_get_ok l =
let open Lwt.Syntax in
let+ l = l in
let err = ref None in
try
l
|> List.map (function
| Error _e as e ->
err := Some e;
raise Exit
| Ok v -> v)
|> Result.ok
with Exit -> ( match !err with None -> assert false | Some v -> v)
let get ro s =
let*? base_dir = get_subdirs ro Mirage_kv.Key.empty in
let*? dir = find base_dir s in
let*? subdirs = get_subdirs ro dir in
let+? l =
subdirs
|> Lwt_list.map_s (fun lang_dir ->
let+? files = get_values ro lang_dir in
(lang_dir, files))
|> lwt_list_get_ok
in
l
let assets ro = let assets ro =
let*$ base_dir = get_subdirs ro Mirage_kv.Key.empty in let*? terms_assoc = get ro "terms" in
let*$ terms_dir = find base_dir "terms" in let+? privacy_assoc = get ro "privacy" in
let*$ privacy_dir = find base_dir "privacy" in (terms_assoc, privacy_assoc)
let*$ terms_subdirs = get_subdirs ro terms_dir in
let*$ privacy_subdirs = get_subdirs ro privacy_dir in
let*$ _terms_files =
terms_subdirs |> Lwt_list.map_s (get_values ro) |> Lwt_result.ok
in
let*$ _privacy_files =
privacy_subdirs |> Lwt_list.map_s (get_values ro) |> Lwt_result.ok
in
Lwt_result.return ()
end end
let tls certificate_ro key_ro = let tls certificate_ro key_ro =