mirror of
https://github.com/ninenines/cowboy.git
synced 2025-07-14 20:30:23 +00:00
Add UTF-8 support to example file_server
LH: I have fixed issues in the PR and incorporated changes from a sister PR by @djankovic (git author: Dom J). I also made sure the UTF-8 files were readable without Chinese fonts and added their downloading to the examples test suite.
This commit is contained in:
parent
32594a5199
commit
4f26d6a573
4 changed files with 20 additions and 4 deletions
8
examples/file_server/priv/中文/中文.html
Normal file
8
examples/file_server/priv/中文/中文.html
Normal file
|
@ -0,0 +1,8 @@
|
|||
<html>
|
||||
<head>
|
||||
<meta charset='utf-8'>
|
||||
</head>
|
||||
<body>
|
||||
中文!
|
||||
</body>
|
||||
</html>
|
|
@ -8,6 +8,7 @@
|
|||
-export([allowed_methods/2]).
|
||||
-export([resource_exists/2]).
|
||||
-export([content_types_provided/2]).
|
||||
-export([charsets_provided/2]).
|
||||
|
||||
%% Callback Callbacks
|
||||
-export([list_json/2]).
|
||||
|
@ -31,12 +32,15 @@ content_types_provided(Req, State) ->
|
|||
{{<<"application">>, <<"json">>, []}, list_json}
|
||||
], Req, State}.
|
||||
|
||||
charsets_provided(Req, State) ->
|
||||
{[<<"utf-8">>], Req, State}.
|
||||
|
||||
list_json(Req, {Path, Fs}) ->
|
||||
Files = [ <<(list_to_binary(F))/binary>> || F <- Fs ],
|
||||
Files = [unicode:characters_to_binary(F) || F <- Fs],
|
||||
{jsx:encode(Files), Req, Path}.
|
||||
|
||||
list_html(Req, {Path, Fs}) ->
|
||||
Body = [[ links(Path, F) || F <- [".."|Fs] ]],
|
||||
Body = [[links(Path, unicode:characters_to_binary(F)) || F <- [".."|Fs]]],
|
||||
HTML = [<<"<!DOCTYPE html><html><head><title>Index</title></head>",
|
||||
"<body>">>, Body, <<"</body></html>\n">>],
|
||||
{HTML, Req, Path}.
|
||||
|
|
|
@ -15,7 +15,8 @@ start(_Type, _Args) ->
|
|||
{'_', [
|
||||
{"/[...]", cowboy_static, {priv_dir, file_server, "", [
|
||||
{mimetypes, cow_mimetypes, all},
|
||||
{dir_handler, directory_h}
|
||||
{dir_handler, directory_h},
|
||||
{charset, <<"utf-8">>}
|
||||
]}}
|
||||
]}
|
||||
]),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue