Skip to content
Snippets Groups Projects
Commit e240784f authored by feld's avatar feld
Browse files

Revert "Merge branch 'to-jpeg' into 'mfc-develop'"

This reverts merge request !1
parent db045c20
Branches revert-db045c20
No related tags found
No related merge requests found
......@@ -49,7 +49,7 @@ def convert(client, path) do
"source_key" => MFC.rename_original_path(path),
"versions" => %{
"original" => %{
"dest_key" => change_to_jpg(path),
"dest_key" => path,
"resolution" => @resolution,
"method" => @convert_method,
"auto_orient" => @auto_orient,
......@@ -93,9 +93,4 @@ def build_preview_url(path) do
%URI{uri | path: uri.path <> postfix_preview_name}
|> to_string
end
@spec change_to_jpg(String.t()) :: String.t()
def change_to_jpg(path) do
Regex.replace(~r/\.(.*?)$/, path, ".jpg")
end
end
defmodule Pleroma.Uploaders.MFCImageTest do
use Pleroma.DataCase
describe "change_to_jpg" do
test "image extenstion is converted to jpg" do
assert "some/image/path.jpg" ==
Pleroma.Uploaders.MFC.Image.change_to_jpg("some/image/path.png")
assert "some/image/path.jpg" ==
Pleroma.Uploaders.MFC.Image.change_to_jpg("some/image/path.tiff")
assert "some/image/path.jpg" ==
Pleroma.Uploaders.MFC.Image.change_to_jpg("some/image/path.png_original")
end
test "image extenstion for jpg is preserved" do
assert "some/image/path.jpg" ==
Pleroma.Uploaders.MFC.Image.change_to_jpg("some/image/path.jpg")
end
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment