Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-20 17:27:00 +01:00
Code Releases Activity

Get rid of a call to misc:have_eimp()

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2018-01-15 13:14:51 +03:00
parent b970c88941
commit d3aab2ea18
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mod_http_upload.erl
View File

@ -851,20 +851,15 @@ code_to_message(_Code) -> <<"">>.
-spec identify(binary(), binary()) -> {ok, media_info()} | pass.
identify(Path, Data) ->
case misc:have_eimp() of
true ->
case eimp:identify(Data) of
{ok, Info} ->
{ok, #media_info{
type = proplists:get_value(type, Info),
width = proplists:get_value(width, Info),
height = proplists:get_value(height, Info)}};
{error, Why} ->
?DEBUG("Cannot identify type of ~s: ~s",
[Path, eimp:format_error(Why)]),
pass
end;
false ->
case eimp:identify(Data) of
{ok, Info} ->
{ok, #media_info{
type = proplists:get_value(type, Info),
width = proplists:get_value(width, Info),
height = proplists:get_value(height, Info)}};
{error, Why} ->
?DEBUG("Cannot identify type of ~s: ~s",
[Path, eimp:format_error(Why)]),
pass
end.