This commit is contained in:
swrup 2026-02-12 11:25:57 +01:00
parent 28eb9fae55
commit b49e352848
5 changed files with 90 additions and 80 deletions

View file

@ -24,7 +24,7 @@ let etag k =
let etag =
match k with Terms -> Config.terms_etag | Privacy -> Config.privacy_etag
in
etag |> Headers_lib.Etag.of_crockford32 |> Result.get_ok
etag |> Headers_lib.Etag.parse |> Result.get_ok
let legal_version = function
| Terms -> Assets_config.terms_legal_version
@ -50,7 +50,7 @@ let supported_lang_arr, supported_ext_arr =
path_l
in
let lang_l = List.sort_uniq String.compare lang_l in
let etag = Headers_lib.Etag.to_raw_string (etag t) in
let etag = (etag t).value in
List.iter
(fun path ->
let etag' = Fpath.to_string (Fpath.rem_ext (Fpath.base path)) in
@ -162,10 +162,10 @@ end
(* ! lang and mime must be supported *)
let get_content ~lang ~mime t =
let etag = Headers_lib.Etag.to_raw_string (etag t) in
let ext = Mimetype.to_extension_exn mime in
let path =
Fpath.to_string Fpath.((v (Assets_config.base_dir t) / lang / etag) + ext)
Fpath.to_string
Fpath.((v (Assets_config.base_dir t) / lang / (etag t).value) + ext)
in
match Assets_crunch.read path with
| None -> Fmt.failwith "static file not found: `%s`" path