From 2a5b29d1c39fe04067135b64e8475d3ff06bcdab Mon Sep 17 00:00:00 2001 From: swrup Date: Mon, 13 Oct 2025 03:17:30 +0200 Subject: [PATCH] --- src/assets.ml | 16 ++++++++-------- src/headers.ml | 6 +++--- src/mte.ml | 2 +- src/util.ml | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/assets.ml b/src/assets.ml index cf1ed97b..36940fb6 100644 --- a/src/assets.ml +++ b/src/assets.ml @@ -13,16 +13,16 @@ type t = | Privacy let etag = function - | Terms -> Config_mte.terms_etag - | Privacy -> Config_mte.privacy_etag + | Terms -> Config.terms_etag + | Privacy -> Config.privacy_etag let legal_version = function - | Terms -> Config_mte.terms_legal_version - | Privacy -> Config_mte.privacy_legal_version + | Terms -> Config.terms_legal_version + | Privacy -> Config.privacy_legal_version let base_dir = function - | Terms -> Config_mte.terms_dir - | Privacy -> Config_mte.privacy_dir + | Terms -> Config.terms_dir + | Privacy -> Config.privacy_dir (* TODO better use of Fmt to have error prefix or smthing @@ -55,9 +55,9 @@ let supported_lang_arr, supported_ext_arr = let () = if List.is_empty lang_l then Fmt.failwith "no language supported"; if List.is_empty ext_l then Fmt.failwith "no mimetype supported"; - if not @@ List.mem Config_mte.default_lang lang_l then + if not @@ List.mem Config.default_lang lang_l then Fmt.failwith "default language `%s` files not found" - Config_mte.default_lang; + Config.default_lang; if not @@ List.mem ".txt" ext_l then Fmt.failwith "plain text file not found"; if not @@ List.mem ".md" ext_l then Fmt.failwith "markdown file not found"; diff --git a/src/headers.ml b/src/headers.ml index 7283a84d..7c6525f0 100644 --- a/src/headers.ml +++ b/src/headers.ml @@ -19,14 +19,14 @@ let select_language headers = |> Cohttp.Accept.qsort |> List.map (fun (_q, lang) -> lang) |> List.map (function - | Cohttp.Accept.AnyLanguage -> Config_mte.default_lang + | Cohttp.Accept.AnyLanguage -> Config.default_lang | Language language_range -> ( (* ignore language subtags (e.g. "en-US" -> "en") *) match language_range with | [] -> assert false | primary_tag :: _ -> primary_tag)) |> List.find_opt Assets.is_supported_lang - |> Option.value ~default:Config_mte.default_lang + |> Option.value ~default:Config.default_lang let select_encoding headers = Vif.Headers.get headers "accept-encoding" @@ -37,7 +37,7 @@ let select_encoding headers = | Cohttp.Accept.Identity -> Some `Identity | Deflate -> Some `DEFLATE | Gzip -> Some `Gzip - | AnyEncoding -> Some Config_mte.default_encoding + | AnyEncoding -> Some Config.default_encoding | Encoding _ | Compress -> (* unsupported *) None) |> function | [] -> assert false diff --git a/src/mte.ml b/src/mte.ml index f94ad473..8c013b47 100644 --- a/src/mte.ml +++ b/src/mte.ml @@ -83,7 +83,7 @@ module Static = struct in let* () = (* todo: is it "taler-privacy-version" for /policy ? *) - add ~field:"taler-terms-version" Config_mte.terms_legal_version + add ~field:"taler-terms-version" Config.terms_legal_version in let* () = add ~field:"avail-languages" Headers.avail_languages_header_value diff --git a/src/util.ml b/src/util.ml index 18436a1a..047ffc7e 100644 --- a/src/util.ml +++ b/src/util.ml @@ -24,7 +24,7 @@ module Mimetype = struct List.find_opt (( = ) (m, m_sub)) mimetype_l | AnyMediaSubtype m -> List.find_opt (fun (m', _) -> String.equal m m') mimetype_l - | AnyMedia -> Some Config_mte.default_mimetype + | AnyMedia -> Some Config.default_mimetype let to_extension (m, m_sub) = assert (m <> "*");