support ImageInTerminal 0.5

Author: t-bltg

Project.toml

@@ -41,8 +41,9 @@ GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
 ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19"
 ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
 ImageTransformations = "02fcd773-0e25-5acc-982a-7f6622650795"
+Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 TestImages = "5e47fb64-e119-507b-a336-dd2b206d9990"
 
 [targets]
-test = ["CSVFiles", "DataFrames", "ImageMagick", "ImageTransformations", "GR", "Plots", "TestImages", "ImageIO", "BSON"]
+test = ["BSON", "CSVFiles", "DataFrames", "GR", "ImageIO", "ImageMagick", "ImageTransformations", "Logging", "Plots", "TestImages"]

src/fileio.jl

@@ -56,11 +56,12 @@ function _convert(
     size = (20,40), kw...)
 
     # encode image into string
-    strs = @withcolor ImageInTerminal.encodeimg(
-        ImageInTerminal.SmallBlocks(),
-        ImageInTerminal.TermColor256(),
+    strs = @withcolor ImageInTerminal.ascii_show(
         img,
-        size...)[1]
+        ImageInTerminal.TermColor8bit(),
+        :small,
+        size
+    )
     return join(strs,'\n')
 end
 

src/render.jl

@@ -9,40 +9,56 @@ struct BeforeAfterLimited <: BeforeAfter end
 struct BeforeAfterFull <: BeforeAfter end
 struct BeforeAfterImage <: BeforeAfter end
 
-render_item(::RenderMode, item) = println(item)
+color_buffer(args...) =
+    IOContext(PipeBuffer(), :color=>Base.get_have_color(), args...)
+
+function render_item(::RenderMode, item)
+    io = color_buffer()
+    print(io, item)
+    read(io, String)
+end
 function render_item(::BeforeAfterLimited, item)
-    show(IOContext(stdout, :limit=>true, :displaysize=>(20,80)), "text/plain", item)
-    println()
+    io = color_buffer(
+        :limit=>true,
+        :displaysize=>(20,80)
+    )
+    show(io, "text/plain", item)
+    read(io, String)
 end
 function render_item(::BeforeAfterImage, item)
-    str_item = @withcolor ImageInTerminal.encodeimg(ImageInTerminal.SmallBlocks(), ImageInTerminal.TermColor256(), item, 20, 40)[1]
-    println("eltype: ", eltype(item))
-    println("size: ", map(length, axes(item)))
-    println("thumbnail:")
-    println.(str_item)
+    io = color_buffer()
+    println(io, "eltype: ", eltype(item))
+    println(io, "size: ", map(length, axes(item)))
+    println(io, "thumbnail:")
+    strs = @withcolor ImageInTerminal.ascii_show(
+        item,
+        ImageInTerminal.TermColor8bit(),
+        :small,
+        (20, 40)
+    )
+    print(io, join(strs, '\n'))
+    read(io, String)
 end
 
 ## 2 arg form render for comparing
-function render(mode::BeforeAfter, reference, actual)
-    println("- REFERENCE -------------------")
-    render_item(mode, reference)
-    println("-------------------------------")
-    println("- ACTUAL ----------------------")
-    render_item(mode, actual)
-    println("-------------------------------")
-end
-function render(::Diff, reference, actual)
-    println("- DIFF ------------------------")
-    @withcolor println(deepdiff(reference, actual))
-    println("-------------------------------")
-end
+render(mode::BeforeAfter, reference, actual) = """
+    - REFERENCE -------------------
+    $(render_item(mode, reference))
+    -------------------------------
+    - ACTUAL ----------------------
+    $(render_item(mode, actual))
+    -------------------------------"""
+
+render(mode::Diff, reference, actual) = """
+    - DIFF ------------------------
+    $(@withcolor(render_item(mode, deepdiff(reference, actual))))
+    -------------------------------"""
 
 ## 1 arg form render for new content
-function render(mode::RenderMode, actual)
-    println("- NEW CONTENT -----------------")
-    render_item(mode, actual)
-    println("-------------------------------")
-end
+render(mode::RenderMode, actual) = """
+    - NEW CONTENT -----------------
+    $(render_item(mode, actual))
+    -------------------------------"""
 
 """
     default_rendermode(::DataFormat, actual)

src/test_reference.jl

@@ -132,15 +132,11 @@ function test_reference(
     if !isfile(reference_path)  # when reference file doesn't exists
         mkpath(reference_dir)
         savefile(reference_file, actual)
-        @info(
-            "Reference file for \"$reference_filename\" did not exist. It has been created",
-            new_reference=reference_path,
-        )
+        @info """Reference file for \"$reference_filename\" did not exist. It has been created:
+        $(render(rendermode, actual))
+        """ new_reference = reference_path
 
-        # TODO: move encoding out from render
-        render(rendermode, actual)
-
-        @info("Please run the tests again for any changes to take effect")
+        @info "Please run the tests again for any changes to take effect"
         return nothing # skip current test case
     end
 
@@ -161,13 +157,10 @@ function test_reference(
         savefile(actual_file, actual)
 
         # Report to user.
-        @info(
-            "Reference Test for \"$reference_filename\" failed.",
-            reference=reference_path,
-            actual=actual_path,
-        )
-        render(rendermode, reference, actual)
-
+        @info """Reference Test for \"$reference_filename\" failed:
+        $(render(rendermode, reference, actual))
+        """ reference = reference_path actual = actual_path
+        
         if !isinteractive() && !force_update()
             error("""
             To update the reference images either run the tests interactively with 'include(\"test/runtests.jl\")',
@@ -178,7 +171,7 @@ function test_reference(
 
         if force_update() || input_bool("Replace reference with actual result?")
             mv(actual_path, reference_path; force=true)  # overwrite old file it
-            @info("Please run the tests again for any changes to take effect")
+            @info "Please run the tests again for any changes to take effect"
         else
             @test false
         end

test/references/camera.png

@@ -1,5 +1,5 @@
-▀▀▀▀▀▀▀▀▀
-▀▀▀▀▀▀▀▀▀
-▀▀▀▀▀▀▀▀▀
-▀▀▀▀▀▀▀▀▀
-▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀