simon/tiny_httpd
1
0
Fork 0
mirror of https://github.com/c-cube/tiny_httpd.git synced 2025-12-06 11:15:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(http_of_dir): use file to guess mime type of file

Browse source
This commit is contained in:
Simon Cruanes 2019-12-02 20:52:56 -06:00
parent 8d33f84022
commit 7f97e75147
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/bin/http_of_dir.ml
View file

@ -89,6 +89,15 @@ let html_list_dir ~top ~parent d : string =
Printf.bprintf body "</ul></body>\n"; Printf.bprintf body "</ul></body>\n";
Buffer.contents body Buffer.contents body
let finally_ ~h x f =
try
let y = f x in
h x;
y
with e ->
h x;
raise e
(* TODO (* TODO
let wdays = [|"Sun"; "Mon"; "Tue"; "Wed"; "Thu"; "Fri"; "Sat"|] let wdays = [|"Sun"; "Mon"; "Tue"; "Wed"; "Thu"; "Fri"; "Sat"|]
let date_of_time (f:float) : string = let date_of_time (f:float) : string =
@ -177,8 +186,17 @@ let serve ~config (dir:string) : _ result =
) else ( ) else (
try try
let ic = open_in full_path in let ic = open_in full_path in
let mime_type =
try
let p = Unix.open_process_in (Printf.sprintf "file -i -b %S" full_path) in
finally_ ~h:(fun p->ignore @@ Unix.close_process_in p) p
(fun p ->
try ["Content-Type", String.trim (input_line p)]
with _ -> [])
with _ -> []
in
S.Response.make_raw_stream S.Response.make_raw_stream
~headers:["Etag", Lazy.force mtime] ~headers:(mime_type@["Etag", Lazy.force mtime])
~code:200 (S.Byte_stream.of_chan ic) ~code:200 (S.Byte_stream.of_chan ic)
with e -> with e ->
S.Response.fail ~code:500 "error while reading file: %s" (Printexc.to_string e) S.Response.fail ~code:500 "error while reading file: %s" (Printexc.to_string e)