+ clean up tos

src/headers.ml

@@ -1,22 +1,18 @@
-(* TODO header
-   Cohttp -> Http *)
-
 let accept_header_value =
-  let pp_list pp_item item = Fmt.list ~sep:(Fmt.any ", ") pp_item item in
-  Fmt.str "%a" (pp_list Assets.Mimetype.pp) Assets.Mimetype.all_supported
+  Fmt.str "%a"
+    (Fmt.array ~sep:(Fmt.any ", ") Assets.Mimetype.pp)
+    Assets.Mimetype.arr
 
 let avail_languages_header_value =
-  let pp_array pp_item item = Fmt.array ~sep:(Fmt.any ", ") pp_item item in
-  let s = Fmt.str "%a" (pp_array Fmt.string) Assets.supported_lang_arr in
-  s
+  Fmt.str "%a" (Fmt.array ~sep:(Fmt.any ", ") Fmt.string) Assets.Language.arr
 
 let select_mimetype headers =
   let opt = Vif.Headers.get headers "accept" in
   Cohttp.Accept.media_ranges opt
   |> Cohttp.Accept.qsort
-  |> List.find_map (fun (_q, (m, _p)) -> Assets.Mimetype.of_cohttp_media m)
+  |> List.find_map (fun (_q, (m, _p)) -> Assets.Mimetype.of_cohttp m)
   |> function
-  | None -> Assets.default_mimetype
+  | None -> Assets.Mimetype.default
   | Some mime -> mime
 
 let select_language headers =
@@ -24,9 +20,9 @@ let select_language headers =
   Cohttp.Accept.languages opt
   |> Cohttp.Accept.qsort
   |> List.map snd
-  |> List.find_map Assets.Language.of_cohttp_language
+  |> List.find_map Assets.Language.of_cohttp
   |> function
-  | None -> Assets.default_lang
+  | None -> Assets.Language.default
   | Some lang -> lang
 
 let select_encoding headers =
@@ -38,7 +34,7 @@ let select_encoding headers =
     | Cohttp.Accept.Identity -> Some `Identity
     | Deflate -> Some `DEFLATE
     | Gzip -> Some `Gzip
-    | AnyEncoding -> Some Assets.default_encoding
+    | AnyEncoding -> Some Assets.Assets_config.default_encoding
     | Encoding _ | Compress -> (* unsupported *) None)
   |> function
   | None -> None