Add launcher in build.gradle + + prepare for exposing as library

Author: soywiz

README.md

@@ -9,7 +9,7 @@ And it includes code to process convulational 3x3 kernels on a float matrix.
 
 ![](/docs/kaifu2x.side2side.png)
 
-### How to use?
+### How to use CLI?
 
 You can grab a precompiled jar from [github's the Releases page](https://github.com/soywiz/kaifu2x/releases/)
 
@@ -19,6 +19,29 @@ cd build/libs
 java -jar kaifu2x-all.jar -n0 -s2 input.png output.png
 ```
 
+Install kaifu2x binary in /usr/local/bin:
+
+```
+./gradlew installCli
+```
+
+### How to use as library?
+
+It is published to maven central. In your `build.gradle` (or maven equivalent):
+```
+compile "com.soywiz:kaifu2x:0.1.0"
+```
+
+Exposed API:
+```
+package com.soywiz.kaifu2x
+
+object Kaifu2x {
+	suspend fun noiseReductionRgba(image: Bitmap32, noise: Int, components: List<ColorComponent> = listOf(ColorComponent.Y, ColorComponent.A), parallel: Boolean = true): Bitmap32
+	suspend fun scaleRgba(image: Bitmap32, scale: Int, components: List<ColorComponent> = listOf(ColorComponent.Y, ColorComponent.A), parallel: Boolean = true): Bitmap32
+}
+```
+
 ### Help
 
 ```

build.gradle

@@ -1,8 +1,9 @@
+import java.nio.file.CopyOption
 import java.nio.file.Files
+import java.nio.file.StandardCopyOption
 import java.nio.file.attribute.PosixFilePermission
 
 buildscript {
-    ext.version = '0.1.0'
     ext.kotlin_version = '1.2.10'
     ext.korio_version = '0.18.0'
 
@@ -17,7 +18,7 @@ buildscript {
 }
 
 group 'com.soywiz'
-version version
+version '0.1.0'
 
 apply plugin: 'kotlin'
 apply plugin: 'maven'
@@ -51,7 +52,6 @@ kotlin {
 task fatJarCore(type: Jar) {
     manifest {
         attributes 'Implementation-Title': 'Kaifu2x',
-                'Implementation-Version': "$version",
                 'Main-Class': 'com.soywiz.kaifu2x.Kaifu2xCli'
     }
     baseName = project.name + '-all'
@@ -63,15 +63,20 @@ task fatJarLauncher() {
     doLast {
         File launcherFile = new File(rootProject.buildDir, "libs/kaifu2x")
         launcherFile.write('java -jar $0-all.jar $*')
-
-
         Files.setPosixFilePermissions(launcherFile.toPath(), Files.getPosixFilePermissions(launcherFile.toPath()) + [PosixFilePermission.OWNER_EXECUTE, PosixFilePermission.GROUP_EXECUTE, PosixFilePermission.OTHERS_EXECUTE].toSet())
     }
 }
 
 task fatJar(dependsOn: [fatJarCore, fatJarLauncher]) {
 }
 
+task installCli(dependsOn: fatJar) {
+    doLast {
+        Files.copy(new File(rootProject.buildDir, "libs/kaifu2x").toPath(), new File("/usr/local/bin/kaifu2x").toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES)
+        Files.copy(new File(rootProject.buildDir, "libs/kaifu2x-all.jar").toPath(), new File("/usr/local/bin/kaifu2x-all.jar").toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES)
+    }
+}
+
 task javadoc2(type: Javadoc) {
     failOnError = false
 }
@@ -150,3 +155,6 @@ publishing {
         }
     }
 }
+
+task deploy(dependsOn: ['install', 'uploadArchives']) {
+}

src/main/kotlin/com/soywiz/kaifu2x/Kaifu2x.kt

@@ -46,7 +46,7 @@ object Kaifu2xCli {
 		if (args.size < 2) helpAndExit()
 
 		var parallel = true
-		var components = listOf(ColorComponent.RED, ColorComponent.ALPHA)
+		var components = listOf(ColorComponent.Y, ColorComponent.A)
 		var inputName: String? = null
 		var outputName: String? = null
 		var noiseReduction: Int = 0
@@ -65,8 +65,8 @@ object Kaifu2xCli {
 				"-n3" -> noiseReduction = 3
 				"-s1" -> scale = 1
 				"-s2" -> scale = 2
-				"-cl" -> components = listOf(ColorComponent.RED)
-				"-cla" -> components = listOf(ColorComponent.RED, ColorComponent.ALPHA)
+				"-cl" -> components = listOf(ColorComponent.Y)
+				"-cla" -> components = listOf(ColorComponent.Y, ColorComponent.A)
 				"-clca" -> components = ColorComponent.ALL.toList()
 				else -> {
 					if (c.startsWith("-")) invalidOp("Unknown switch $c")
@@ -107,11 +107,11 @@ object Kaifu2xCli {
 
 // Exposed functions
 object Kaifu2x {
-	suspend fun noiseReductionRgba(image: Bitmap32, noise: Int, components: List<ColorComponent>, parallel: Boolean): Bitmap32 {
+	suspend fun noiseReductionRgba(image: Bitmap32, noise: Int, components: List<ColorComponent> = listOf(ColorComponent.Y, ColorComponent.A), parallel: Boolean = true): Bitmap32 {
 		return getNoiseModel(noise)?.waifu2xCoreRgba("noise$noise", image, components, parallel) ?: image
 	}
 
-	suspend fun scaleRgba(image: Bitmap32, scale: Int, components: List<ColorComponent>, parallel: Boolean): Bitmap32 {
+	suspend fun scaleRgba(image: Bitmap32, scale: Int, components: List<ColorComponent> = listOf(ColorComponent.Y, ColorComponent.A), parallel: Boolean = true): Bitmap32 {
 		return when (scale) {
 			1 -> image
 			2 -> getScale2xModel().waifu2xCoreRgba("scale$scale", image.scaleNearest(scale, scale), components, parallel)

src/main/kotlin/com/soywiz/kaifu2x/util/Bitmap32Ext.kt

@@ -49,6 +49,11 @@ enum class ColorComponent(val index: Int) {
 	}
 }
 
+val ColorComponent.Companion.Y get() = ColorComponent.RED
+val ColorComponent.Companion.Cb get() = ColorComponent.GREEN
+val ColorComponent.Companion.Cr get() = ColorComponent.BLUE
+val ColorComponent.Companion.A get() = ColorComponent.ALPHA
+
 fun Bitmap32.writeComponent(dstCmp: ColorComponent, from: Bitmap32, srcCmp: ColorComponent) {
 	val fdata = from.data
 	for (n in 0 until area) {