feature: introduce functions to split items in two sorts

Author: Attacktive

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "com.github.attacktive"
-version = "1.1.4"
+version = "1.2.0"
 java.sourceCompatibility = JavaVersion.VERSION_21
 
 configurations {

src/main/kotlin/com/github/attacktive/troubleshootereditor/domain/common/Properties.kt

@@ -1,14 +1,17 @@
 package com.github.attacktive.troubleshootereditor.domain.common
 
+import java.util.function.Predicate
+
 data class Properties(private val list: List<Property> = mutableListOf()) {
+	fun containsKey(key: String) = keys().contains(key)
+	fun containsKeyThat(predicate: Predicate<String>) = keys().any { predicate.test(it) }
+
 	fun add(pair: Pair<String, String>) = list.addLast(Property(pair))
 	fun asSequence() = list.asSequence()
 	fun toMap() = list.associate { it.key to it.value }
 
-	private fun findByKey(key: String) = list.find { it.key == key }
-
 	fun diff(those: Properties): Properties {
-		val thoseKeys = those.list.map { it.key }.toMutableList()
+		val thoseKeys = those.keys().toMutableList()
 
 		val withThese = list.map { `this` ->
 			val key = `this`.key
@@ -36,4 +39,8 @@ data class Properties(private val list: List<Property> = mutableListOf()) {
 
 		return Properties(withThese + withThose)
 	}
+
+	private fun keys() = list.map { it.key }.toSet()
+
+	private fun findByKey(key: String) = list.find { it.key == key }
 }

src/main/kotlin/com/github/attacktive/troubleshootereditor/domain/common/SaveData.kt

@@ -1,10 +1,17 @@
 package com.github.attacktive.troubleshootereditor.domain.common
 
+import com.fasterxml.jackson.annotation.JsonGetter
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.github.attacktive.troubleshootereditor.domain.company.Company
 import com.github.attacktive.troubleshootereditor.domain.item.Item
 import com.github.attacktive.troubleshootereditor.domain.roster.Roster
 
 data class SaveData(val company: Company, val rosters: List<Roster>, val items: List<Item>) {
 	override fun toString(): String = jacksonObjectMapper().writeValueAsString(this)
+
+	@JsonGetter
+	fun gears() = items.filter { it.isGear() }
+
+	@JsonGetter
+	fun consumables() = items.filter { !it.isGear() }
 }

src/main/kotlin/com/github/attacktive/troubleshootereditor/domain/item/Item.kt

@@ -58,6 +58,14 @@ data class Item(val id: Long, val type: String, val count: Long, val status: Str
 		return DiffResult(id, type, count, status, properties)
 	}
 
+	fun isGear(): Boolean {
+		if (properties.containsKey("Binded") || properties.containsKey("Lv") || properties.containsKey("Transmog")) {
+			return true
+		}
+
+		return properties.containsKeyThat{ it.matches(Regex("Option/.+", RegexOption.IGNORE_CASE)) }
+	}
+
 	data class DiffResult(val id: Long, val type: String?, val count: Long?, val status: String?, override val properties: Properties): PropertiesDiffAware {
 		override fun generateStatements(connection: Connection): List<PreparedStatement> {
 			val statements: List<PreparedStatement> = mutableListOf()