From 88227898edd26a823d0942fc7226adb61a20cb5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 13 Jun 2016 13:23:22 +0200 Subject: Merge static_world and web_server examples The new example is called file_server and it's basically the same as web_server was. The name is clearer than the original, all examples being "Web servers". The new example is also tested and the test suite has been refactored a little. --- examples/web_server/src/directory_lister.erl | 36 ---------------------------- 1 file changed, 36 deletions(-) delete mode 100644 examples/web_server/src/directory_lister.erl (limited to 'examples/web_server/src/directory_lister.erl') diff --git a/examples/web_server/src/directory_lister.erl b/examples/web_server/src/directory_lister.erl deleted file mode 100644 index bc34073..0000000 --- a/examples/web_server/src/directory_lister.erl +++ /dev/null @@ -1,36 +0,0 @@ -%% Feel free to use, reuse and abuse the code in this file. - --module(directory_lister). --behaviour(cowboy_middleware). - --export([execute/2]). - -execute(Req, Env) -> - case lists:keyfind(handler, 1, Env) of - {handler, cowboy_static} -> redirect_directory(Req, Env); - _H -> {ok, Req, Env} - end. - -redirect_directory(Req, Env) -> - Path = cowboy_req:path_info(Req), - Path1 = << <> || S <- Path >>, - {handler_opts, {_, _, _, Extra}} = lists:keyfind(handler_opts, 1, Env), - {dir_handler, DirHandler} = lists:keyfind(dir_handler, 1, Extra), - FullPath = resource_path(Path1), - case valid_path(Path) and filelib:is_dir(FullPath) of - true -> handle_directory(Req, Env, Path1, FullPath, DirHandler); - false -> {ok, Req, Env} - end. - -handle_directory(Req, Env, Prefix, Path, DirHandler) -> - Env1 = lists:keydelete(handler, 1, - lists:keydelete(handler_opts, 1, Env)), - {ok, Req, [{handler, DirHandler}, {handler_opts, {Prefix, Path}} | Env1]}. - -valid_path([]) -> true; -valid_path([<<"..">> | _T]) -> false; -valid_path([<<"/", _/binary>> | _T]) -> false; -valid_path([_H | Rest]) -> valid_path(Rest). - -resource_path(Path) -> - filename:join([code:priv_dir(web_server), Path]). -- cgit v1.2.3