diff options
author | lain <lain@soykaf.club> | 2023-02-13 17:10:58 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2023-02-13 17:10:58 +0000 |
commit | 19933a06bf9759bd3ec3cbe63f064039a659c656 (patch) | |
tree | 363ac99d6aa3764c3b183b883e366e6d760c9b8b /lib | |
parent | a5509de389ada99a6ac8aae027e77ccb1355f06d (diff) | |
parent | 024bb27fc70b7352610a6d1b73a7af2f09465edd (diff) | |
download | pleroma-19933a06bf9759bd3ec3cbe63f064039a659c656.tar.gz pleroma-19933a06bf9759bd3ec3cbe63f064039a659c656.zip |
Merge branch 'tusooa/exiftool' into 'develop'
Ignores in exiftool read descriptions
See merge request pleroma/pleroma!3840
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/upload/filter/exiftool/read_description.ex | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/upload/filter/exiftool/read_description.ex b/lib/pleroma/upload/filter/exiftool/read_description.ex index 03d698a81..543b22031 100644 --- a/lib/pleroma/upload/filter/exiftool/read_description.ex +++ b/lib/pleroma/upload/filter/exiftool/read_description.ex @@ -33,7 +33,10 @@ defmodule Pleroma.Upload.Filter.Exiftool.ReadDescription do defp read_when_empty(_, file, tag) do try do {tag_content, 0} = - System.cmd("exiftool", ["-b", "-s3", tag, file], stderr_to_stdout: true, parallelism: true) + System.cmd("exiftool", ["-b", "-s3", tag, file], + stderr_to_stdout: false, + parallelism: true + ) tag_content = String.trim(tag_content) |