Skip to content

Commit

Permalink
Refactor and add more tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@dacr
dacr committed Jul 21, 2024
1 parent 877e058 commit 0135e9e
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 39 deletions.
49 changes: 29 additions & 20 deletions modules/processor/src/main/scala/fr/janalyse/sotohp/processor/BasicImaging.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ case object BasicImaging {
import javax.swing.{ImageIcon, JFrame, JLabel}
import javax.swing.WindowConstants
import java.awt.FlowLayout

val icon = ImageIcon(image)
val frame = JFrame()
frame.setLayout(FlowLayout())
Expand All @@ -101,24 +101,13 @@ case object BasicImaging {
frame
}

def reshapeImage(
input: Path,
output: Path,
targetMaxSize: Int,
rotateDegrees: Option[Double] = None,
compressionLevel: Option[Double] = None
): Unit = {
val originalImage = ImageIO.read(input.toFile)
if (originalImage == null) throw Exception(s"Unsupported image format : $input") // TODO enhance error support
val ratio = targetMaxSize.toDouble / math.max(originalImage.getWidth, originalImage.getHeight)
val targetWidth = (originalImage.getWidth() * ratio).toInt
val targetHeight = (originalImage.getHeight() * ratio).toInt
val resizedImage = resize(originalImage, targetWidth, targetHeight)
val finalImage =
if (rotateDegrees.exists(_ != 0d))
rotate(resizedImage, rotateDegrees.get)
else resizedImage
def load(input: Path): BufferedImage = {
val image = ImageIO.read(input.toFile)
if (image == null) throw RuntimeException(s"Unsupported input image format : $input") // TODO enhance error support
image
}

def save(output: Path, image: BufferedImage, compressionLevel: Option[Double] = None): Unit = {
val foundImageType = fileTypeFromName(output)
val foundImageWriter =
foundImageType
Expand All @@ -133,12 +122,32 @@ case object BasicImaging {
}
Using(ImageIO.createImageOutputStream(output.toFile)) { outputStream =>
writer.setOutput(outputStream)
val outputImage = IIOImage(finalImage, null, null)
val outputImage = IIOImage(image, null, null)
writer.write(null, outputImage, params)
writer.dispose()
}
case None =>

case None => throw RuntimeException(s"Unsupported output image format : $output") // TODO enhance error support
}
}

def reshapeImage(
input: Path,
output: Path,
targetMaxSize: Int,
rotateDegrees: Option[Double] = None,
compressionLevel: Option[Double] = None
): Unit = {
val originalImage = load(input)
val ratio = targetMaxSize.toDouble / math.max(originalImage.getWidth, originalImage.getHeight)
val targetWidth = (originalImage.getWidth() * ratio).toInt
val targetHeight = (originalImage.getHeight() * ratio).toInt
val resizedImage = resize(originalImage, targetWidth, targetHeight)
val finalImage =
if (rotateDegrees.exists(_ != 0d))
rotate(resizedImage, rotateDegrees.get)
else resizedImage
save(output, finalImage, compressionLevel)
}

}
57 changes: 38 additions & 19 deletions modules/processor/src/test/scala/fr/janalyse/sotohp/processor/BasicImagingSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package fr.janalyse.sotohp.processor

import zio.*
import zio.test.*
import fr.janalyse.sotohp.processor.BasicImaging.{display, fileTypeFromName, mirror, resize, rotate}
import fr.janalyse.sotohp.processor.BasicImaging

import java.awt.Color
import java.awt.image.BufferedImage
Expand Down Expand Up @@ -33,26 +33,26 @@ object BasicImagingSpec extends ZIOSpecDefault {
suite("Image types feature")(
test("should return correct type for a given filename") {
assertTrue(
fileTypeFromName("test.scala").contains("scala"),
fileTypeFromName("test.scala.backup").contains("backup"),
fileTypeFromName("test.c").contains("c"),
fileTypeFromName("test.JPG").contains("jpg"),
fileTypeFromName(".truc").contains("truc")
BasicImaging.fileTypeFromName("test.scala").contains("scala"),
BasicImaging.fileTypeFromName("test.scala.backup").contains("backup"),
BasicImaging.fileTypeFromName("test.c").contains("c"),
BasicImaging.fileTypeFromName("test.JPG").contains("jpg"),
BasicImaging.fileTypeFromName(".truc").contains("truc")
)
},
test("should not return any type when file has no extension") {
assertTrue(
fileTypeFromName("test").isEmpty,
fileTypeFromName("test.").isEmpty,
fileTypeFromName("a.").isEmpty
BasicImaging.fileTypeFromName("test").isEmpty,
BasicImaging.fileTypeFromName("test.").isEmpty,
BasicImaging.fileTypeFromName("a.").isEmpty
)
}
),
suite("Image resizing feature")(
test("should resize the image to a lower size") {
for {
original <- ZIO.attempt(imageSample())
resized <- ZIO.attempt(resize(original, imageSampleWidth / 2, imageSampleHeight / 2))
resized <- ZIO.attempt(BasicImaging.resize(original, imageSampleWidth / 2, imageSampleHeight / 2))
} yield assertTrue(
resized.getWidth == imageSampleWidth / 2,
resized.getHeight == imageSampleHeight / 2,
Expand All @@ -62,7 +62,7 @@ object BasicImagingSpec extends ZIOSpecDefault {
test("should resize the image to a greater size") {
for {
original <- ZIO.attempt(imageSample())
resized <- ZIO.attempt(resize(original, imageSampleWidth * 2, imageSampleHeight * 2))
resized <- ZIO.attempt(BasicImaging.resize(original, imageSampleWidth * 2, imageSampleHeight * 2))
} yield assertTrue(
resized.getWidth == imageSampleWidth * 2,
resized.getHeight == imageSampleHeight * 2,
Expand All @@ -72,8 +72,8 @@ object BasicImagingSpec extends ZIOSpecDefault {
test("should keep the image ratio when resized to a greater size") {
for {
original <- ZIO.attempt(imageSample())
resized1 <- ZIO.attempt(resize(original, imageSampleWidth * 2, imageSampleHeight * 4))
resized2 <- ZIO.attempt(resize(original, imageSampleWidth * 4, imageSampleHeight * 2))
resized1 <- ZIO.attempt(BasicImaging.resize(original, imageSampleWidth * 2, imageSampleHeight * 4))
resized2 <- ZIO.attempt(BasicImaging.resize(original, imageSampleWidth * 4, imageSampleHeight * 2))
} yield assertTrue(
resized1.getWidth == imageSampleWidth * 2,
resized1.getHeight == imageSampleHeight * 2,
Expand All @@ -86,8 +86,8 @@ object BasicImagingSpec extends ZIOSpecDefault {
test("should keep the image ratio when resized to a lower size") {
for {
original <- ZIO.attempt(imageSample())
resized1 <- ZIO.attempt(resize(original, imageSampleWidth / 2, imageSampleHeight / 4))
resized2 <- ZIO.attempt(resize(original, imageSampleWidth / 4, imageSampleHeight / 2))
resized1 <- ZIO.attempt(BasicImaging.resize(original, imageSampleWidth / 2, imageSampleHeight / 4))
resized2 <- ZIO.attempt(BasicImaging.resize(original, imageSampleWidth / 4, imageSampleHeight / 2))
} yield assertTrue(
resized1.getWidth == imageSampleWidth / 4,
resized1.getHeight == imageSampleHeight / 4,
Expand All @@ -102,7 +102,7 @@ object BasicImagingSpec extends ZIOSpecDefault {
test("should rotate the image to the right") {
for {
original <- ZIO.attempt(imageSample())
rotated <- ZIO.attempt(rotate(original, 90))
rotated <- ZIO.attempt(BasicImaging.rotate(original, 90))
} yield assertTrue(
rotated.getWidth == imageSampleHeight,
rotated.getHeight == imageSampleWidth,
Expand All @@ -114,7 +114,7 @@ object BasicImagingSpec extends ZIOSpecDefault {
test("should rotate the image to the left") {
for {
original <- ZIO.attempt(imageSample())
rotated <- ZIO.attempt(rotate(original, -90))
rotated <- ZIO.attempt(BasicImaging.rotate(original, -90))
} yield assertTrue(
rotated.getWidth == imageSampleHeight,
rotated.getHeight == imageSampleWidth,
Expand All @@ -129,7 +129,7 @@ object BasicImagingSpec extends ZIOSpecDefault {
test("should mirror the image horizontally") {
for {
original <- ZIO.attempt(imageSample())
mirrored <- ZIO.attempt(mirror(original))
mirrored <- ZIO.attempt(BasicImaging.mirror(original))
} yield assertTrue(
mirrored.getRGB(imageSampleWidth - 10, 10) == Color.GREEN.getRGB,
mirrored.getRGB(0, 0) == Color.BLACK.getRGB,
Expand All @@ -140,14 +140,33 @@ object BasicImagingSpec extends ZIOSpecDefault {
test("should mirror the image vertically") {
for {
original <- ZIO.attempt(imageSample())
mirrored <- ZIO.attempt(mirror(original, horizontally = false, vertically = true))
mirrored <- ZIO.attempt(BasicImaging.mirror(original, horizontally = false, vertically = true))
} yield assertTrue(
mirrored.getRGB(10, imageSampleHeight - 10) == Color.GREEN.getRGB,
mirrored.getRGB(0, 0) == Color.BLACK.getRGB,
mirrored.getRGB(10, 10) == Color.LIGHT_GRAY.getRGB,
mirrored.getRGB(imageSampleWidth - 1, imageSampleHeight - 1) == Color.BLACK.getRGB
)
}
),
suite("Image input/output feature")(
test("should be able to save and load images") {
import java.nio.file.*
import java.nio.*
for {
original <- ZIO.attempt(imageSample())
tmpPath = Path.of(scala.util.Properties.tmpDir)
imagePath <- ZIO.attempt(Files.createTempFile(tmpPath, "tempoImage", ".png"))
_ <- ZIO.attempt(BasicImaging.save(imagePath, original))
loadedImage <- ZIO.attempt(BasicImaging.load(imagePath))
} yield assertTrue(
loadedImage.getWidth == imageSampleWidth,
loadedImage.getHeight == imageSampleHeight,
loadedImage.getRGB(0, 0) == Color.BLACK.getRGB,
loadedImage.getRGB(10, 10) == Color.GREEN.getRGB,
loadedImage.getRGB(imageSampleWidth - 1, imageSampleHeight - 1) == Color.BLACK.getRGB
)
}
)
)
}

0 comments on commit 0135e9e

Please sign in to comment.