pleroma

commit: 56227ef7ba097c6be39a7e70b67c426a3016e0ab
parent 8c761942b1963bff08d98eeb22b84b0f327d68e4
Author: Ilja <ilja@ilja.space>
Date:   Fri,  1 Jul 2022 12:31:34 +0200

Descriptions from exif data with only whitespeces are considered empty

I noticed that pictures taken with Ubuntu-Touch have whitespace in one of the fields
This should just be ignored imo

Diffstat:
M
lib/pleroma/upload/filter/exiftool/read_description.ex
2
++
A
test/fixtures/image_with_imagedescription_and_caption-abstract_whitespaces.jpg
0

M
test/pleroma/upload/filter/exiftool/read_description_test.exs
19
+++++++++++++++++++

3 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/lib/pleroma/upload/filter/exiftool/read_description.ex b/lib/pleroma/upload/filter/exiftool/read_description.ex
@@ -35,6 +35,8 @@ defmodule Pleroma.Upload.Filter.Exiftool.ReadDescription do
       {tag_content, 0} =
         System.cmd("exiftool", ["-b", "-s3", tag, file], stderr_to_stdout: true, parallelism: true)
 
+      tag_content = String.trim(tag_content)
+
       if tag_content != "" and
            String.length(tag_content) <=
              Pleroma.Config.get([:instance, :description_limit]),
diff --git a/test/fixtures/image_with_imagedescription_and_caption-abstract_whitespaces.jpg b/test/fixtures/image_with_imagedescription_and_caption-abstract_whitespaces.jpg
Binary files differ.
diff --git a/test/pleroma/upload/filter/exiftool/read_description_test.exs b/test/pleroma/upload/filter/exiftool/read_description_test.exs
@@ -83,6 +83,25 @@ defmodule Pleroma.Upload.Filter.Exiftool.ReadDescriptionTest do
              {:ok, :filtered, @uploads}
   end
 
+  test "Ignores content with only whitespace" do
+    uploads = %Pleroma.Upload{
+      name: "non-existant.jpg",
+      content_type: "image/jpeg",
+      path:
+        Path.absname(
+          "test/fixtures/image_with_imagedescription_and_caption-abstract_whitespaces.jpg"
+        ),
+      tempfile:
+        Path.absname(
+          "test/fixtures/image_with_imagedescription_and_caption-abstract_whitespaces.jpg"
+        ),
+      description: nil
+    }
+
+    assert Filter.Exiftool.ReadDescription.filter(uploads) ==
+             {:ok, :filtered, uploads}
+  end
+
   test "Return nil when image description from EXIF data can't be read" do
     uploads = %Pleroma.Upload{
       name: "non-existant.jpg",