tweak: Change GofileChildContent.Folder#tags to List<String>

sya-ri · Aug 12, 2022 · cd881b0 · cd881b0
1 parent f157215
commit cd881b0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/commonMain/kotlin/dev/s7a/gofile/GofileChildContent.kt b/src/commonMain/kotlin/dev/s7a/gofile/GofileChildContent.kt
@@ -79,7 +79,7 @@ sealed class GofileChildContent {
         val password: Boolean = false,
         val description: String? = null,
         val expire: Long? = null,
-        val tags: String? = null
+        val tags: List<String> = emptyList()
     ) : GofileChildContent() {
         override val type = GofileContentType.Folder
     }

diff --git a/src/commonMain/kotlin/dev/s7a/gofile/GofileChildContentSerializer.kt b/src/commonMain/kotlin/dev/s7a/gofile/GofileChildContentSerializer.kt
@@ -93,7 +93,7 @@ class GofileChildContentSerializer : KSerializer<GofileChildContent> {
                 val password = element["password"]?.jsonPrimitive?.boolean ?: false
                 val description = element["description"]?.jsonPrimitive?.content
                 val expire = element["expire"]?.jsonPrimitive?.long
-                val tags = element["tags"]?.jsonPrimitive?.content
+                val tags = element["tags"]?.jsonPrimitive?.content?.split(",").orEmpty()
                 GofileChildContent.Folder(id, name, parentFolder, createTime, childs, code, public, password, description, expire, tags)
             }
         }
@@ -125,7 +125,7 @@ class GofileChildContentSerializer : KSerializer<GofileChildContent> {
                     if (value.password) put("password", true)
                     if (value.description != null) put("description", value.description)
                     if (value.expire != null) put("expire", value.expire)
-                    if (value.tags != null) put("tags", value.tags)
+                    if (value.tags.isNotEmpty()) put("tags", value.tags.joinToString(","))
                 }
             }
         }

diff --git a/src/commonTest/kotlin/ChildContentTests.kt b/src/commonTest/kotlin/ChildContentTests.kt
@@ -112,7 +112,7 @@ class ChildContentTests {
                     password = true,
                     "_description",
                     987654321,
-                    "t,a,g,s"
+                    listOf("t", "a", "g", "s")
                 )
             )
         )
@@ -241,7 +241,7 @@ class ChildContentTests {
                 password = true,
                 "_description",
                 987654321,
-                "t,a,g,s"
+                listOf("t", "a", "g", "s")
             ),
             json.decodeFromString(
                 GofileChildContent.serializer(),

diff --git a/src/commonTest/kotlin/ContentTests.kt b/src/commonTest/kotlin/ContentTests.kt
@@ -181,7 +181,7 @@ class ContentTests {
                             password = true,
                             "_description3",
                             12345,
-                            "t,a,g,s,3"
+                            listOf("t", "a", "g", "s", "3")
                         )
                     )
                 )
@@ -299,7 +299,7 @@ class ContentTests {
                         password = true,
                         "_description3",
                         12345,
-                        "t,a,g,s,3"
+                        listOf("t", "a", "g", "s", "3")
                     )
                 )
             ),