mirror of
https://github.com/philomena-dev/philomena.git
synced 2024-11-23 20:18:00 +01:00
Allow warning exit from jpegtran
This commit is contained in:
parent
d799c9d1bd
commit
81d44314e3
1 changed files with 9 additions and 2 deletions
|
@ -8,6 +8,9 @@ defmodule PhilomenaMedia.Processors.Jpeg do
|
||||||
|
|
||||||
@behaviour Processor
|
@behaviour Processor
|
||||||
|
|
||||||
|
@exit_success 0
|
||||||
|
@exit_warning 2
|
||||||
|
|
||||||
@spec versions(Processors.version_list()) :: [Processors.version_filename()]
|
@spec versions(Processors.version_list()) :: [Processors.version_filename()]
|
||||||
def versions(sizes) do
|
def versions(sizes) do
|
||||||
Enum.map(sizes, fn {name, _} -> "#{name}.jpg" end)
|
Enum.map(sizes, fn {name, _} -> "#{name}.jpg" end)
|
||||||
|
@ -68,7 +71,7 @@ defmodule PhilomenaMedia.Processors.Jpeg do
|
||||||
|
|
||||||
_ ->
|
_ ->
|
||||||
# Transmux only: Strip EXIF without touching orientation
|
# Transmux only: Strip EXIF without touching orientation
|
||||||
{_output, 0} = System.cmd("jpegtran", ["-copy", "none", "-outfile", stripped, file])
|
validate_return(System.cmd("jpegtran", ["-copy", "none", "-outfile", stripped, file]))
|
||||||
end
|
end
|
||||||
|
|
||||||
stripped
|
stripped
|
||||||
|
@ -77,7 +80,7 @@ defmodule PhilomenaMedia.Processors.Jpeg do
|
||||||
defp optimize(file) do
|
defp optimize(file) do
|
||||||
optimized = Briefly.create!(extname: ".jpg")
|
optimized = Briefly.create!(extname: ".jpg")
|
||||||
|
|
||||||
{_output, 0} = System.cmd("jpegtran", ["-optimize", "-outfile", optimized, file])
|
validate_return(System.cmd("jpegtran", ["-optimize", "-outfile", optimized, file]))
|
||||||
|
|
||||||
optimized
|
optimized
|
||||||
end
|
end
|
||||||
|
@ -108,4 +111,8 @@ defmodule PhilomenaMedia.Processors.Jpeg do
|
||||||
defp srgb_profile do
|
defp srgb_profile do
|
||||||
Path.join(File.cwd!(), "priv/icc/sRGB.icc")
|
Path.join(File.cwd!(), "priv/icc/sRGB.icc")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp validate_return({_output, ret}) when ret in [@exit_success, @exit_warning] do
|
||||||
|
:ok
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue