lazzexus/Kafkatorio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

code tidy up

Browse source
This commit is contained in:
Adam 2022-03-12 01:37:35 +01:00
parent e32e2a0311
commit e3954c184a
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/events-server/build.gradle.kts
View file

@ -15,6 +15,7 @@ description = """
val projectId: String by project.extra val projectId: String by project.extra
val kafkaStateDir = layout.projectDirectory.dir("kafka-state")
dependencies { dependencies {
@ -66,7 +67,7 @@ tasks.withType<KotlinCompile> {
val kafkaStateDirDelete by tasks.registering(Delete::class) { val kafkaStateDirDelete by tasks.registering(Delete::class) {
group = project.name group = project.name
mustRunAfter(kafkaConsumersDelete) mustRunAfter(kafkaConsumersDelete)
delete(layout.projectDirectory.dir("kafka-state")) delete(kafkaStateDir)
} }
val kafkaConsumersDelete by tasks.registering(KafkaConsumerGroupsTask.DeleteAll::class) { val kafkaConsumersDelete by tasks.registering(KafkaConsumerGroupsTask.DeleteAll::class) {
@ -76,3 +77,9 @@ val kafkaConsumersDelete by tasks.registering(KafkaConsumerGroupsTask.DeleteAll:
//tasks.run.configure { //tasks.run.configure {
// dependsOn(kafkatorioEventsServerKafkaForceReset) // dependsOn(kafkatorioEventsServerKafkaForceReset)
//} //}
idea {
module {
excludeDirs = excludeDirs + kafkaStateDir.asFile
}
}

14
modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/topology/model.kt
View file

@ -16,21 +16,21 @@ value class FactorioServerId(val id: String) {
enum class ChunkSize( enum class ChunkSize(
val zoomLevel: Int, val zoomLevel: Int,
) : Comparable<ChunkSize> { ) : Comparable<ChunkSize> {
CHUNK_512(-1), // 512 CHUNK_512(-1),
CHUNK_256(0), // 256 CHUNK_256(0),
CHUNK_128(1), // 128 CHUNK_128(1),
CHUNK_064(2), // 64 CHUNK_064(2),
CHUNK_032(3), // 32 CHUNK_032(3),
; ;
val tilesPerChunk: Int = 2f.pow(8 - zoomLevel).roundToInt() val tilesPerChunk: Int = 2f.pow(8 - zoomLevel).roundToInt()
init { init {
require(tilesPerChunk > 0) { "chunkSize must be positive" } require(tilesPerChunk > 0) { "tilesPerChunk $tilesPerChunk must be positive" }
// 1000 & 0111 = 0000 => pow^2 // 1000 & 0111 = 0000 => pow^2
// 1001 & 1000 = 1000 => !pow^2 // 1001 & 1000 = 1000 => !pow^2
require(tilesPerChunk and (tilesPerChunk - 1) == 0) { require(tilesPerChunk and (tilesPerChunk - 1) == 0) {
"tilesPerChunk must be a power-of-two number" "tilesPerChunk $tilesPerChunk must be a power-of-two number"
} }
} }