Feed whole image to eimp:identify/1

Fixes #2859

src/mod_http_upload.erl

@@ -111,7 +111,8 @@
 	 external_secret        :: binary()}).
 
 -record(media_info,
-	{type   :: atom(),
+	{path   :: binary(),
+	 type   :: atom(),
 	 height :: integer(),
 	 width  :: integer()}).
 
@@ -780,10 +781,10 @@ parse_http_request(#request{host = Host, path = Path}) ->
 store_file(Path, Request, FileMode, DirMode, GetPrefix, Slot, Thumbnail) ->
     case do_store_file(Path, Request, FileMode, DirMode) of
 	ok when Thumbnail ->
-	    case identify(Path) of
+	    case read_image(Path) of
-		{ok, MediaInfo} ->
+		{ok, Data, MediaInfo} ->
-		    case convert(Path, MediaInfo) of
+		    case convert(Data, MediaInfo) of
-			{ok, OutPath, OutMediaInfo} ->
+			{ok, #media_info{path = OutPath} = OutMediaInfo} ->
 			    [UserDir, RandDir | _] = Slot,
 			    FileName = filename:basename(OutPath),
 			    URL = str:join([GetPrefix, UserDir,
@@ -888,14 +889,15 @@ format_error(Reason) ->
 %%--------------------------------------------------------------------
 %% Image manipulation stuff.
 %%--------------------------------------------------------------------
--spec identify(binary()) -> {ok, media_info()} | pass.
+-spec read_image(binary()) -> {ok, binary(), media_info()} | pass.
-identify(Path) ->
+read_image(Path) ->
-    try
+    case file:read_file(Path) of
-	{ok, Fd} = file:open(Path, [read, raw]),
+	{ok, Data} ->
-	{ok, Data} = file:read(Fd, 1024),
 	    case eimp:identify(Data) of
 		{ok, Info} ->
-		{ok, #media_info{
+		    {ok, Data,
+		     #media_info{
+			path = Path,
 			type = proplists:get_value(type, Info),
 			width = proplists:get_value(width, Info),
 			height = proplists:get_value(height, Info)}};
@@ -903,15 +905,15 @@ identify(Path) ->
 		    ?DEBUG("Cannot identify type of ~s: ~s",
 			   [Path, eimp:format_error(Why)]),
 		    pass
-	end
+	    end;
-    catch _:{badmatch, {error, Reason}} ->
+	{error, Reason} ->
 	    ?DEBUG("Failed to read file ~s: ~s",
 		   [Path, format_error(Reason)]),
 	    pass
     end.
 
 -spec convert(binary(), media_info()) -> {ok, binary(), media_info()} | pass.
-convert(Path, #media_info{type = T, width = W, height = H} = Info) ->
+convert(InData, #media_info{path = Path, type = T, width = W, height = H} = Info) ->
     if W * H >= 25000000 ->
 	    ?DEBUG("The image ~s is more than 25 Mpix", [Path]),
 	    pass;
@@ -926,14 +928,12 @@ convert(Path, #media_info{type = T, width = W, height = H} = Info) ->
 			  H > W -> {round(W*300/H), 300};
 			  true -> {300, 300}
 		       end,
-	    OutInfo = #media_info{type = T, width = W1, height = H1},
+	    OutInfo = #media_info{path = OutPath, type = T, width = W1, height = H1},
-	    case file:read_file(Path) of
+	    case eimp:convert(InData, T, [{scale, {W1, H1}}]) of
-		{ok, Data} ->
-		    case eimp:convert(Data, T, [{scale, {W1, H1}}]) of
 		{ok, OutData} ->
 		    case file:write_file(OutPath, OutData) of
 			ok ->
-				    {ok, OutPath, OutInfo};
+			    {ok, OutInfo};
 			{error, Why} ->
 			    ?ERROR_MSG("Failed to write to ~s: ~s",
 				       [OutPath, format_error(Why)]),
@@ -943,11 +943,6 @@ convert(Path, #media_info{type = T, width = W, height = H} = Info) ->
 		    ?ERROR_MSG("Failed to convert ~s to ~s: ~s",
 			       [Path, OutPath, eimp:format_error(Why)]),
 		    pass
-		    end;
-		{error, Why} ->
-		    ?ERROR_MSG("Failed to read file ~s: ~s",
-			       [Path, format_error(Why)]),
-		    pass
 	    end
     end.