#7 Fix preview configuration (#8)

* #7 Fix preview configuration

* #7 Add scale method enum

* #7 Review fixes

* #7 Review fixes 2

Author: YokiToki

README.md

@@ -10,7 +10,7 @@ repositories {
 }
 
 // Append dependency
-implementation("com.icerockdev:storage-service:0.3.0")
+implementation("com.icerockdev:storage-service:0.4.0")
 ````
 
 ## Library usage

storage-service/build.gradle.kts

@@ -12,7 +12,7 @@ apply(plugin = "java")
 apply(plugin = "kotlin")
 
 group = "com.icerockdev"
-version = "0.3.0"
+version = "0.4.0"
 
 val sourcesJar by tasks.registering(Jar::class) {
     classifier = "sources"

storage-service/src/main/kotlin/com/icerockdev/service/storage/preview/AbstractPreview.kt

@@ -11,7 +11,7 @@ abstract class AbstractPreview(
     val width: Int?,
     val height: Int?
 ) {
-    abstract val scaleMethod: ScaleMethod
+    abstract val scaleMethod: PreviewScaleMethod
     var prefix = "${width ?: "n"}x${height ?: "n"}"
     var imageProcessor: AbstractPreview.(imageBytes: ByteArray) -> ByteArray = AbstractPreview::boundImage
 

storage-service/src/main/kotlin/com/icerockdev/service/storage/preview/JpegPreviewImpl.kt

@@ -4,7 +4,6 @@
 
 package com.icerockdev.service.storage.preview
 
-import com.sksamuel.scrimage.ScaleMethod
 import com.sksamuel.scrimage.nio.ImageWriter
 import com.sksamuel.scrimage.nio.JpegWriter
 
@@ -13,7 +12,7 @@ class JpegPreviewImpl(
     height: Int?,
     private val compression: Int = 80,
     private val progressive: Boolean = false,
-    override val scaleMethod: ScaleMethod = ScaleMethod.Bicubic
+    override val scaleMethod: PreviewScaleMethod = PreviewScaleMethod.Bicubic
 ) : AbstractPreview(width, height) {
 
     init {

storage-service/src/main/kotlin/com/icerockdev/service/storage/preview/PngPreviewImpl.kt

@@ -4,15 +4,14 @@
 
 package com.icerockdev.service.storage.preview
 
-import com.sksamuel.scrimage.ScaleMethod
 import com.sksamuel.scrimage.nio.ImageWriter
 import com.sksamuel.scrimage.nio.PngWriter
 
 class PngPreviewImpl(
     width: Int?,
     height: Int?,
     private val compression: Int = 9, // between 0 and 9, 9 - max compression
-    override val scaleMethod: ScaleMethod = ScaleMethod.Bicubic
+    override val scaleMethod: PreviewScaleMethod = PreviewScaleMethod.Bicubic
 ) : AbstractPreview(width, height) {
 
     init {

storage-service/src/main/kotlin/com/icerockdev/service/storage/preview/PreviewScaleMethod.kt

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package com.icerockdev.service.storage.preview
+
+import com.sksamuel.scrimage.ScaleMethod
+
+enum class PreviewScaleMethod {
+    FastScale,
+    Lanczos3,
+    BSpline,
+    Bilinear,
+    Bicubic;
+
+    internal fun getScale(): ScaleMethod {
+        return when(this) {
+            FastScale -> ScaleMethod.FastScale
+            Lanczos3 -> ScaleMethod.Lanczos3
+            BSpline -> ScaleMethod.BSpline
+            Bilinear -> ScaleMethod.Bilinear
+            Bicubic -> ScaleMethod.Bicubic
+        }
+    }
+}

storage-service/src/main/kotlin/com/icerockdev/service/storage/preview/PreviewUtils.kt

@@ -18,5 +18,5 @@ fun loadImage(imageByteArray: ByteArray): ImmutableImage {
  * TODO: make more helpers
  */
 fun AbstractPreview.boundImage(imageBytes: ByteArray): ByteArray {
-    return loadImage(imageBytes).bound(getWidthOrMax(), getHeightOrMax(), scaleMethod).bytes(getWriter())
+    return loadImage(imageBytes).bound(getWidthOrMax(), getHeightOrMax(), scaleMethod.getScale()).bytes(getWriter())
 }