Skip to content

Commit 64eb57e

Browse files
committed
style: ktlint
1 parent 17f5c34 commit 64eb57e

File tree

3 files changed

+25
-24
lines changed

3 files changed

+25
-24
lines changed

src/main/kotlin/com/bangbang93/openbmclapi/agent/nat/NatService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ class NatService(
1313
private val config: ClusterConfig,
1414
) {
1515
private val mapper: NatMapper = WeUpnpNatMapper()
16+
1617
@Volatile private var handle: MappingHandle? = null
18+
1719
@Volatile private var external: InetAddress? = null
1820

1921
fun startIfEnabled(): InetAddress? {
@@ -63,5 +65,3 @@ class NatService(
6365
}
6466
}
6567
}
66-
67-

src/main/kotlin/com/bangbang93/openbmclapi/agent/service/ClusterService.kt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import com.bangbang93.openbmclapi.agent.model.FileInfo
88
import com.bangbang93.openbmclapi.agent.model.FileList
99
import com.bangbang93.openbmclapi.agent.model.OpenbmclapiAgentConfiguration
1010
import com.bangbang93.openbmclapi.agent.model.SyncConfig
11-
import com.bangbang93.openbmclapi.agent.storage.IStorage
1211
import com.bangbang93.openbmclapi.agent.nat.NatService
12+
import com.bangbang93.openbmclapi.agent.storage.IStorage
1313
import com.bangbang93.openbmclapi.agent.util.HashUtil
1414
import com.bangbang93.openbmclapi.agent.util.emitAck
1515
import com.github.avrokotlin.avro4k.Avro
@@ -174,12 +174,13 @@ class ClusterService(
174174

175175
logger.trace { "Enabling cluster" }
176176

177-
val upnpIp = try {
178-
natService.startIfEnabled()
179-
} catch (e: Exception) {
180-
logger.error(e) { "UPnP/NAT 端口映射失败" }
181-
throw e
182-
}
177+
val upnpIp =
178+
try {
179+
natService.startIfEnabled()
180+
} catch (e: Exception) {
181+
logger.error(e) { "UPnP/NAT 端口映射失败" }
182+
throw e
183+
}
183184

184185
val hostForEnable = config.clusterIp ?: upnpIp?.hostAddress
185186

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.bangbang93.openbmclapi.agent.nat
22

3-
import kotlin.test.Test
4-
import kotlin.test.assertTrue
53
import io.github.oshai.kotlinlogging.KotlinLogging
64
import org.bitlet.weupnp.GatewayDiscover
75
import java.net.Inet4Address
6+
import kotlin.test.Test
7+
import kotlin.test.assertTrue
88

99
class WeUpnpNatMapperTest {
1010
private val logger = KotlinLogging.logger {}
@@ -15,22 +15,24 @@ class WeUpnpNatMapperTest {
1515
logger.info { "Discovering UPnP gateways..." }
1616
val found = discover.discover()
1717
logger.info { "Discovery result: found=$found, gw=${discover.validGateway}" }
18-
val gw = discover.validGateway ?: run {
19-
logger.info { "No UPnP IGD gateway found - skipping test" }
20-
return
21-
}
18+
val gw =
19+
discover.validGateway ?: run {
20+
logger.info { "No UPnP IGD gateway found - skipping test" }
21+
return
22+
}
2223

2324
val mapper = WeUpnpNatMapper()
2425
val privatePort = 4000
2526
val publicPort = 4000
2627

27-
val handle = mapper.map(
28-
privatePort = privatePort,
29-
publicPort = publicPort,
30-
protocol = Protocol.TCP,
31-
ttlSeconds = 300,
32-
description = "openbmclapi-test",
33-
)
28+
val handle =
29+
mapper.map(
30+
privatePort = privatePort,
31+
publicPort = publicPort,
32+
protocol = Protocol.TCP,
33+
ttlSeconds = 300,
34+
description = "openbmclapi-test",
35+
)
3436

3537
val ip = mapper.externalIp()
3638
logger.info { "External IP: ${ip.hostAddress}" }
@@ -40,5 +42,3 @@ class WeUpnpNatMapperTest {
4042
logger.info { "Unmapped result: $removed" }
4143
}
4244
}
43-
44-

0 commit comments

Comments
 (0)