From e1ee9ac488dbba5e6898e92bc9ebf93096e671b1 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Thu, 18 Jan 2024 20:20:12 +0100 Subject: moved all shdebug stuff into categories --- .../skyhanni/events/DebugDataCollectEvent.kt | 39 +++++++++++++++++----- 1 file changed, 31 insertions(+), 8 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/events') diff --git a/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt index a53a144cf..1a4eabb92 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt @@ -2,10 +2,11 @@ package at.hannibal2.skyhanni.events import at.hannibal2.skyhanni.utils.StringUtils.equalsIgnoreColor -class DebugDataCollectEvent(private val builder: StringBuilder, private val search: String?) : LorenzEvent() { +class DebugDataCollectEvent(private val list: MutableList, private val search: String?) : LorenzEvent() { + var empty = true private var currentTitle = "" - private var exit = false + private var ignore = false fun title(title: String) { if (currentTitle != "") error("Title already set: '$currentTitle'") @@ -13,8 +14,28 @@ class DebugDataCollectEvent(private val builder: StringBuilder, private val sear currentTitle = title } - fun exit(text: String) { - exit = true + fun ignore(block: MutableList.() -> Unit) { + val list = mutableListOf() + block(list) + ignore(list) + } + + fun ignore(text: String) { + ignore(listOf(text)) + } + + private fun ignore(text: List) { + ignore = true + addData(text) + } + + fun addData(block: MutableList.() -> Unit) { + val list = mutableListOf() + block(list) + addData(list) + } + + fun addData(text: String) { addData(listOf(text)) } @@ -22,11 +43,11 @@ class DebugDataCollectEvent(private val builder: StringBuilder, private val sear if (currentTitle == "") error("Title not set") writeData(text) currentTitle = "" - exit = false + ignore = false } private fun writeData(text: List) { - if (exit && search == null) return + if (ignore && search == null) return search?.let { if (!search.equalsIgnoreColor("all")) { if (!currentTitle.contains(search, ignoreCase = true)) { @@ -34,9 +55,11 @@ class DebugDataCollectEvent(private val builder: StringBuilder, private val sear } } } - builder.append("\n== $currentTitle ==\n") + empty = false + list.add("") + list.add("== $currentTitle ==") for (line in text) { - builder.append(" $line\n") + list.add(" $line") } } } -- cgit