Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Rename badly entitled record field

This commit is contained in:
Evgeniy Khramtsov 2015-10-26 15:05:28 +03:00
parent 137a4ee087
commit 6f2e178de1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod_http_upload.erl
View File

@ -94,7 +94,7 @@
-record(media_info, -record(media_info,
{type :: string(), {type :: string(),
height :: integer(), height :: integer(),
weight :: integer()}). width :: integer()}).
-type state() :: #state{}. -type state() :: #state{}.
-type slot() :: [binary()]. -type slot() :: [binary()].
@ -844,7 +844,7 @@ identify(Path) ->
{ok, #media_info{ {ok, #media_info{
type = string:to_lower(T), type = string:to_lower(T),
height = list_to_integer(H), height = list_to_integer(H),
weight = list_to_integer(W)}}; width = list_to_integer(W)}};
_ -> _ ->
?ERROR_MSG("failed to identify type of ~s: ~s", [Path, Res]), ?ERROR_MSG("failed to identify type of ~s: ~s", [Path, Res]),
{error, Res} {error, Res}
@ -852,7 +852,7 @@ identify(Path) ->
-spec convert(string(), media_info()) -> {ok, string()} | pass. -spec convert(string(), media_info()) -> {ok, string()} | pass.
convert(Path, #media_info{type = T, weight = W, height = H}) -> convert(Path, #media_info{type = T, width = W, height = H}) ->
if W*H >= 25000000 -> if W*H >= 25000000 ->
?DEBUG("the image ~s is more than 25 Mbpx", [Path]), ?DEBUG("the image ~s is more than 25 Mbpx", [Path]),
pass; pass;
@ -882,7 +882,7 @@ convert(Path, #media_info{type = T, weight = W, height = H}) ->
thumb_el(Path, URI) -> thumb_el(Path, URI) ->
ContentType = guess_content_type(Path), ContentType = guess_content_type(Path),
case identify(Path) of case identify(Path) of
{ok, #media_info{height = H, weight = W}} -> {ok, #media_info{height = H, width = W}} ->
#xmlel{name = <<"thumbnail">>, #xmlel{name = <<"thumbnail">>,
attrs = [{<<"xmlns">>, ?NS_THUMBS_1}, attrs = [{<<"xmlns">>, ?NS_THUMBS_1},
{<<"media-type">>, ContentType}, {<<"media-type">>, ContentType},