diff --git a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/top/TopBarButtons.kt b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/top/TopBarButtons.kt index f8a9db4..ecc86b8 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/top/TopBarButtons.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/gui/filemanager/top/TopBarButtons.kt @@ -10,6 +10,7 @@ import androidx.compose.ui.unit.dp import xyz.atnrch.wrench.json.JsonLayout import xyz.atnrch.wrench.json.SerializedWatcherEntry import xyz.atnrch.wrench.watcher.WatcherEntry +import xyz.atnrch.wrench.watcher.WatcherManager @Composable fun TopBarButtons( @@ -17,13 +18,18 @@ fun TopBarButtons( values: MutableCollection ) { Button(onClick = { - println(values.toList().joinToString(",")) jsonLayout.writeLayout(SerializedWatcherEntry.fromUnserializedEntries(values.toList())) }) { Text("Save") } Spacer(Modifier.width(10.dp)) Button(onClick = { + values.clear() + // not the cleanest way of doing things + // but tbh I'm tired after working on serialization + // for the past 2 hrs + // TODO: Make it cleaner maybe? + WatcherManager.CURRENT_ID = 0 jsonLayout.readLayout() }) { Text("Load") diff --git a/src/main/kotlin/xyz/atnrch/wrench/watcher/WatcherManager.kt b/src/main/kotlin/xyz/atnrch/wrench/watcher/WatcherManager.kt index a156c75..91b4a4b 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/watcher/WatcherManager.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/watcher/WatcherManager.kt @@ -5,16 +5,18 @@ import java.io.File import java.nio.file.Path class WatcherManager(private val entries: MutableMap) { - private var currentId: Int = -1 + companion object { + var CURRENT_ID: Int = -1 + } fun addFile(file: File, outputs: ArrayList) { val watcherEntry = WatcherEntry(file, outputs) - currentId += 1 - entries[currentId] = watcherEntry + CURRENT_ID += 1 + entries[CURRENT_ID] = watcherEntry Logger.info( """ Tracking new file: - ID: $currentId + ID: $CURRENT_ID Name: ${file.name} Path: ${file.absolutePath} """.trimIndent()