fix(plugin-compress): Lzstring 编码单独处理

Leon406 · May 6, 2024 · ec12549 · ec12549
1 parent 225a711
commit ec12549
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 32 deletions.
diff --git a/plugin-compress/build.gradle.kts b/plugin-compress/build.gradle.kts
@@ -1,5 +1,5 @@
 group = "me.leon.toolsfx"
-version = "1.2.1"
+version = "1.2.2"
 
 plugins {
     `java-library`

diff --git a/plugin-compress/src/main/kotlin/me/leon/toolsfx/plugin/CompressController.kt b/plugin-compress/src/main/kotlin/me/leon/toolsfx/plugin/CompressController.kt
@@ -26,7 +26,12 @@ class CompressController : Controller() {
         alg: Compression = Compression.GZIP,
         inputEncode: String = "raw",
         outputEncode: String = "base64",
-    ): String = alg.compress(raw.decodeToByteArray(inputEncode)).encodeTo(outputEncode)
+    ): String =
+        if (alg == Compression.LZString) {
+            Compression.LZString.compress(raw, inputEncode, outputEncode)
+        } else {
+            alg.compress(raw.decodeToByteArray(inputEncode)).encodeTo(outputEncode)
+        }
 
     fun decompress(
         raw: String,
@@ -49,5 +54,10 @@ class CompressController : Controller() {
         alg: Compression = Compression.GZIP,
         inputEncode: String = "raw",
         outputEncode: String = "base64",
-    ) = alg.decompress(raw.decodeToByteArray(inputEncode)).encodeTo(outputEncode)
+    ) =
+        if (alg == Compression.LZString) {
+            Compression.LZString.decompress(raw, inputEncode, outputEncode)
+        } else {
+            alg.decompress(raw.decodeToByteArray(inputEncode)).encodeTo(outputEncode)
+        }
 }
diff --git a/plugin-compress/src/main/kotlin/me/leon/toolsfx/plugin/CompressView.kt b/plugin-compress/src/main/kotlin/me/leon/toolsfx/plugin/CompressView.kt
@@ -13,8 +13,8 @@ import tornadofx.*
 import tornadofx.FX.Companion.messages
 
 class CompressView : PluginFragment(messages["compression"]) {
-    override val version = "v1.2.1"
-    override val date: String = "2024-04-29"
+    override val version = "v1.2.2"
+    override val date: String = "2024-05-06"
     override val author = "Leon406"
     override val description: String = FX.messages["compression"]
 

diff --git a/plugin-compress/src/main/kotlin/me/leon/toolsfx/plugin/compress/Compression.kt b/plugin-compress/src/main/kotlin/me/leon/toolsfx/plugin/compress/Compression.kt
@@ -2,8 +2,10 @@ package me.leon.toolsfx.plugin.compress
 
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
-import me.leon.encode.base.base64
-import me.leon.encode.base.base64Decode
+import me.leon.ext.decodeToByteArray
+import me.leon.ext.encodeTo
+import me.leon.ext.hex2String
+import me.leon.ext.toHex
 import org.apache.commons.compress.compressors.brotli.BrotliCompressorInputStream
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream
@@ -121,22 +123,35 @@ enum class Compression(val alg: String) : ICompress {
             }
     },
     LZString("lzString") {
-        override fun compress(bytes: ByteArray) =
-            LzString.compressToBase64(bytes.decodeToString()).base64Decode()
-
-        override fun decompress(bytes: ByteArray) =
-            LzString.decompressFromBase64(
-                    bytes.base64().let {
-                        // 补充额外 'A===' padding
-                        if (it.endsWith("=")) {
-                            it
-                        } else {
-                            it + "A==="
-                        }
-                    }
-                )
-                ?.toByteArray()
-                ?: byteArrayOf()
+        override fun compress(bytes: ByteArray) = error("Unsupported")
+
+        override fun decompress(bytes: ByteArray) = error("Unsupported")
+
+        override fun compress(raw: String, inputEncode: String, outputEncode: String) =
+            when (outputEncode) {
+                "raw" -> LzString.compress(raw.decodeToByteArray(inputEncode).encodeTo("raw"))
+                "base64" ->
+                    LzString.compressToBase64(raw.decodeToByteArray(inputEncode).encodeTo("raw"))
+                "hex" ->
+                    LzString.compress(raw.decodeToByteArray(inputEncode).encodeTo("raw")).toHex()
+                else -> error("Wrong Encoding!!!")
+            }
+
+        override fun decompress(raw: String, inputEncode: String, outputEncode: String) =
+            when (inputEncode) {
+                "raw" -> LzString.decompress(raw).orEmpty().toByteArray().encodeTo(outputEncode)
+                "base64" ->
+                    LzString.decompressFromBase64(raw)
+                        .orEmpty()
+                        .toByteArray()
+                        .encodeTo(outputEncode)
+                "hex" ->
+                    LzString.decompress(raw.hex2String())
+                        .orEmpty()
+                        .toByteArray()
+                        .encodeTo(outputEncode)
+                else -> error("Wrong Encoding!!!")
+            }
     }
 }
 

diff --git a/plugin-compress/src/main/kotlin/me/leon/toolsfx/plugin/compress/ICompress.kt b/plugin-compress/src/main/kotlin/me/leon/toolsfx/plugin/compress/ICompress.kt
@@ -5,4 +5,16 @@ interface ICompress {
     fun compress(bytes: ByteArray): ByteArray
 
     fun decompress(bytes: ByteArray): ByteArray
+
+    fun compress(
+        raw: String,
+        inputEncode: String = "raw",
+        outputEncode: String = "base64"
+    ): String = ""
+
+    fun decompress(
+        raw: String,
+        inputEncode: String = "raw",
+        outputEncode: String = "base64"
+    ): String = ""
 }
diff --git a/plugin-compress/src/test/kotlin/me/leon/plugin/StringCompression.kt b/plugin-compress/src/test/kotlin/me/leon/plugin/StringCompression.kt
@@ -118,20 +118,20 @@ class StringCompression {
 
     @Test
     fun lzString() {
-        val compressed =
-            Compression.LZString.compress(data.toByteArray()).base64().also { println(it) }
+        val compressed = Compression.LZString.compress(data, "raw", "base64").also { println(it) }
         val decompressed =
-            Compression.LZString.decompress(compressed.base64Decode()).decodeToString().also {
-                println(it)
-            }
+            Compression.LZString.decompress(compressed, "base64", "raw").also { println(it) }
         assertEquals(data, decompressed)
 
-        val bytes =
-            "IIEwbghgdgxgpiABASyiOUAuiDmBXZdAZ0QBtU5EALZHK8uzVHRGaRAI0owg9IUQAzAPYAnIA==="
-                .base64Decode()
+        val bytes = "IIEwbghgdgxgpiABASyiOUAuiDmBXZdAZ0QBtU5EALZHK8uzVHRGaRAI0owg9IUQAzAPYAnIA==="
+
         assertEquals(
             "Advanced indent guides line highlighting can be enabled for",
-            Compression.LZString.decompress(bytes).decodeToString()
+            Compression.LZString.decompress(bytes, "base64", "raw")
+        )
+        assertEquals(
+            "nasller",
+            Compression.LZString.decompress("HYQwzgNhCmBOQ===", "base64", "raw")
         )
 
         println(LzString.compressToBase64("ba"))