erik/mobibot
erik/mobibot
1
1
Fork 0
Code Issues Releases Activity

Fixed colorize function.

Browse source
This commit is contained in:
Erik C. Thauvin 2021-07-30 03:25:45 -07:00
parent 04e88264cd
commit 00caee4bc1
4 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
View file

@ -31,10 +31,10 @@
*/ */
package net.thauvin.erik.mobibot package net.thauvin.erik.mobibot
import net.thauvin.erik.mobibot.msg.Message.Companion.DEFAULT_COLOR
import org.jibble.pircbot.Colors import org.jibble.pircbot.Colors
import org.jsoup.Jsoup import org.jsoup.Jsoup
import java.io.BufferedReader import java.io.BufferedReader
import java.io.File
import java.io.IOException import java.io.IOException
import java.io.InputStreamReader import java.io.InputStreamReader
import java.net.URL import java.net.URL
@ -106,8 +106,10 @@ object Utils {
*/ */
@JvmStatic @JvmStatic
fun colorize(s: String?, color: String): String { fun colorize(s: String?, color: String): String {
return if (s.isNullOrBlank()) { return if (s.isNullOrEmpty()) {
Colors.NORMAL ""
} else if (color == DEFAULT_COLOR) {
s
} else if (Colors.BOLD == color || Colors.REVERSE == color) { } else if (Colors.BOLD == color || Colors.REVERSE == color) {
color + s + color color + s + color
} else { } else {

3
src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
View file

@ -31,6 +31,7 @@
*/ */
package net.thauvin.erik.mobibot.msg package net.thauvin.erik.mobibot.msg
import net.thauvin.erik.semver.Constants
import org.jibble.pircbot.Colors import org.jibble.pircbot.Colors
/** /**
@ -38,7 +39,7 @@ import org.jibble.pircbot.Colors
*/ */
open class Message { open class Message {
companion object { companion object {
var DEFAULT_COLOR = Colors.NORMAL var DEFAULT_COLOR = Constants.EMPTY
} }
/** Message color. */ /** Message color. */

9
src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
View file

@ -53,6 +53,7 @@ import net.thauvin.erik.mobibot.Utils.today
import net.thauvin.erik.mobibot.Utils.unescapeXml import net.thauvin.erik.mobibot.Utils.unescapeXml
import net.thauvin.erik.mobibot.Utils.uptime import net.thauvin.erik.mobibot.Utils.uptime
import net.thauvin.erik.mobibot.Utils.urlReader import net.thauvin.erik.mobibot.Utils.urlReader
import net.thauvin.erik.mobibot.msg.Message.Companion.DEFAULT_COLOR
import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThat
import org.jibble.pircbot.Colors import org.jibble.pircbot.Colors
import org.testng.annotations.BeforeClass import org.testng.annotations.BeforeClass
@ -125,9 +126,11 @@ class UtilsTest {
.isEqualTo(Colors.RED + ascii + Colors.NORMAL) .isEqualTo(Colors.RED + ascii + Colors.NORMAL)
assertThat(colorize(ascii, Colors.BOLD)).describedAs("colorized(bold)") assertThat(colorize(ascii, Colors.BOLD)).describedAs("colorized(bold)")
.isEqualTo(Colors.BOLD + ascii + Colors.BOLD) .isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
assertThat(colorize(null, Colors.RED)).describedAs("colorize(null)").isEqualTo(Colors.NORMAL) assertThat(colorize(null, Colors.RED)).describedAs("colorize(null)").isEqualTo("")
assertThat(colorize("", Colors.RED)).describedAs("colorize()").isEqualTo(Colors.NORMAL) assertThat(colorize("", Colors.RED)).describedAs("colorize()").isEqualTo("")
assertThat(colorize(ascii, DEFAULT_COLOR)).describedAs("colorize(none)").isEqualTo(ascii)
assertThat(colorize(" ", Colors.NORMAL)).describedAs("colorize(blank)")
.isEqualTo(Colors.NORMAL + " " + Colors.NORMAL)
} }
@Test @Test

6
version.properties
View file

@ -1,9 +1,9 @@
#Generated by the Semver Plugin for Gradle #Generated by the Semver Plugin for Gradle
#Fri Jul 30 02:43:43 PDT 2021 #Fri Jul 30 03:23:18 PDT 2021
version.buildmeta=1111 version.buildmeta=1115
version.major=0 version.major=0
version.minor=8 version.minor=8
version.patch=0 version.patch=0
version.prerelease=beta version.prerelease=beta
version.project=mobibot version.project=mobibot
version.semver=0.8.0-beta+1111 version.semver=0.8.0-beta+1115