Makce docroot/1 as exported fun to DRY

OtpChatBot · Mar 18, 2014 · 3b8e018 · 3b8e018
1 parent fd1d2e2
commit 3b8e018
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/src/web/web_admin.erl b/src/web/web_admin.erl
@@ -9,6 +9,7 @@
 -behaviour(gen_server).
 
 -export([start_link/0]).
+-export([docroot/1]).
 
 %% gen_server callbacks
 -export([init/1,
@@ -20,13 +21,18 @@
 
 -record(state, {}).
 
+
 %% ===================================================================
 %% API functions
 %% ===================================================================
 
 start_link() ->
     gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
 
+docroot(Append) ->
+    priv_dir() ++ "webadmin/" ++ Append.
+
+
 %% ===================================================================
 %% web admin process callbacks
 %% ===================================================================
@@ -80,11 +86,10 @@ terminate(_Reason, _State) ->
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
 
+
 %% ===================================================================
 %% Internal functions
 %% ===================================================================
-docroot(Append) ->
-    priv_dir() ++ "webadmin/" ++ Append.
 
 priv_dir() ->
     case code:priv_dir(ybot) of

diff --git a/src/web/web_admin_req_handler.erl b/src/web/web_admin_req_handler.erl
@@ -10,6 +10,7 @@
 -export([handle/2]).
 -export([terminate/3]).
 
+
 %%=============================================================================
 %% Cowboy handler callback
 %%=============================================================================
@@ -39,14 +40,16 @@ handle(Req, State) ->
 terminate(_Reason, _Req, _State) ->
     ok.
 
+
 %%=============================================================================
 %% Internal functions
 %%=============================================================================
+
 authorized(Req, State) ->
     {Path, Req1} = cowboy_req:path(Req),
     case Path of
         <<"/">> ->
-            {ok, Bin} = file:read_file(docroot("index.html")),
+            {ok, Bin} = file:read_file(web_admin:docroot("index.html")),
             {ok, Req2} = cowboy_req:reply(200,
                                           [
                                            {<<"content-type">>, <<"text/html">>}
@@ -248,18 +251,6 @@ unauthorized_body() ->
     </html>
     ">>.
 
-docroot(Append) ->
-    priv_dir() ++ "webadmin/" ++ Append.
-
-priv_dir() ->
-    case code:priv_dir(ybot) of
-        {error, bad_name} ->
-            {ok, Cwd} = file:get_cwd(),
-            Cwd ++ "/" ++ "priv/";
-        Priv ->
-            Priv ++ "/"
-    end.
-
 config_option(Key, Options) ->
     case lists:keyfind(Key, 1, Options) of
         {Key, Value} -> Value;