-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
33740b1
commit 75f5b52
Showing
13 changed files
with
78 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 0 additions & 17 deletions
17
...in/com/makeevrserg/empireprojekt/mobile/features/status/data/MinecraftStatusRepository.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,7 @@ | ||
| package com.makeevrserg.empireprojekt.mobile.features.status.data | ||
|
|
||
| import com.makeevrserg.empireprojekt.mobile.features.status.data.model.MinecraftStatusResponse | ||
| import io.ktor.client.HttpClient | ||
| import io.ktor.client.call.body | ||
| import io.ktor.client.request.get | ||
| import kotlinx.coroutines.withContext | ||
| import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers | ||
|
|
||
| interface MinecraftStatusRepository { | ||
| suspend fun get(): Result<MinecraftStatusResponse> | ||
| class Default( | ||
| private val httpClient: HttpClient, | ||
| private val dispatchers: KotlinDispatchers | ||
| ) : MinecraftStatusRepository { | ||
| override suspend fun get(): Result<MinecraftStatusResponse> = | ||
| runCatching<Default, MinecraftStatusResponse> { | ||
| val request = withContext(dispatchers.IO) { | ||
| httpClient.get("https://api.minetools.eu/ping/play.empireprojekt.ru") | ||
| } | ||
| request.body() | ||
| }.map { it.copy(description = it.description.replace("§", "")) } | ||
| } | ||
| } |
5 changes: 0 additions & 5 deletions
5
...Main/kotlin/com/makeevrserg/empireprojekt/mobile/features/status/data/StatusRepository.kt
This file was deleted.
Oops, something went wrong.
19 changes: 2 additions & 17 deletions
19
...n/kotlin/com/makeevrserg/empireprojekt/mobile/features/status/data/UrlStatusRepository.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,5 @@ | ||
| package com.makeevrserg.empireprojekt.mobile.features.status.data | ||
|
|
||
| import io.ktor.client.HttpClient | ||
| import io.ktor.client.request.get | ||
| import io.ktor.http.HttpStatusCode | ||
| import kotlinx.coroutines.withContext | ||
| import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers | ||
|
|
||
| class UrlStatusRepository( | ||
| private val url: String, | ||
| private val httpClient: HttpClient, | ||
| private val dispatchers: KotlinDispatchers | ||
| ) : StatusRepository { | ||
| override suspend fun isActive(): Result<Boolean> = runCatching { | ||
| val request = withContext(dispatchers.IO) { | ||
| httpClient.get(url) | ||
| } | ||
| request.status == HttpStatusCode.OK | ||
| } | ||
| interface UrlStatusRepository { | ||
| suspend fun isActive(): Result<Boolean> | ||
| } |
22 changes: 22 additions & 0 deletions
22
...keevrserg/empireprojekt/mobile/features/status/data/impl/MinecraftStatusRepositoryImpl.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package com.makeevrserg.empireprojekt.mobile.features.status.data.impl | ||
|
|
||
| import com.makeevrserg.empireprojekt.mobile.features.status.data.MinecraftStatusRepository | ||
| import com.makeevrserg.empireprojekt.mobile.features.status.data.model.MinecraftStatusResponse | ||
| import io.ktor.client.HttpClient | ||
| import io.ktor.client.call.body | ||
| import io.ktor.client.request.get | ||
| import kotlinx.coroutines.withContext | ||
| import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers | ||
|
|
||
| class MinecraftStatusRepositoryImpl( | ||
| private val httpClient: HttpClient, | ||
| private val dispatchers: KotlinDispatchers | ||
| ) : MinecraftStatusRepository { | ||
| override suspend fun get(): Result<MinecraftStatusResponse> = | ||
| runCatching<MinecraftStatusRepositoryImpl, MinecraftStatusResponse> { | ||
| val request = withContext(dispatchers.IO) { | ||
| httpClient.get("https://api.minetools.eu/ping/play.empireprojekt.ru") | ||
| } | ||
| request.body() | ||
| }.map { it.copy(description = it.description.replace("§", "")) } | ||
| } |
21 changes: 21 additions & 0 deletions
21
...com/makeevrserg/empireprojekt/mobile/features/status/data/impl/UrlStatusRepositoryImpl.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package com.makeevrserg.empireprojekt.mobile.features.status.data.impl | ||
|
|
||
| import com.makeevrserg.empireprojekt.mobile.features.status.data.UrlStatusRepository | ||
| import io.ktor.client.HttpClient | ||
| import io.ktor.client.request.get | ||
| import io.ktor.http.HttpStatusCode | ||
| import kotlinx.coroutines.withContext | ||
| import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers | ||
|
|
||
| class UrlStatusRepositoryImpl( | ||
| private val url: String, | ||
| private val httpClient: HttpClient, | ||
| private val dispatchers: KotlinDispatchers | ||
| ) : UrlStatusRepository { | ||
| override suspend fun isActive(): Result<Boolean> = runCatching { | ||
| val request = withContext(dispatchers.IO) { | ||
| httpClient.get(url) | ||
| } | ||
| request.status == HttpStatusCode.OK | ||
| } | ||
| } |
28 changes: 24 additions & 4 deletions
28
...commonMain/kotlin/com/makeevrserg/empireprojekt/mobile/features/status/di/StatusModule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,36 @@ | ||
| package com.makeevrserg.empireprojekt.mobile.features.status.di | ||
|
|
||
| import com.makeevrserg.empireprojekt.mobile.features.status.data.MinecraftStatusRepository | ||
| import com.makeevrserg.empireprojekt.mobile.features.status.data.UrlStatusRepository | ||
| import com.makeevrserg.empireprojekt.mobile.features.status.data.impl.MinecraftStatusRepositoryImpl | ||
| import com.makeevrserg.empireprojekt.mobile.features.status.data.impl.UrlStatusRepositoryImpl | ||
| import io.ktor.client.HttpClient | ||
| import ru.astrainteractive.klibs.kdi.Factory | ||
| import ru.astrainteractive.klibs.kdi.Module | ||
| import ru.astrainteractive.klibs.kdi.Provider | ||
| import ru.astrainteractive.klibs.kdi.getValue | ||
| import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers | ||
|
|
||
| interface StatusModule : Module { | ||
| val dispatchers: KotlinDispatchers | ||
| val httpClient: HttpClient | ||
|
|
||
| val minecraftStatusRepository: MinecraftStatusRepository | ||
| fun urlStatRepositoryFactory(url: String): Factory<UrlStatusRepository> | ||
| class Default( | ||
| override val dispatchers: KotlinDispatchers, | ||
| override val httpClient: HttpClient | ||
| ) : StatusModule | ||
| private val httpClient: HttpClient | ||
| ) : StatusModule { | ||
| override val minecraftStatusRepository: MinecraftStatusRepository by Provider { | ||
| MinecraftStatusRepositoryImpl( | ||
| httpClient = httpClient, | ||
| dispatchers = dispatchers | ||
| ) | ||
| } | ||
| override fun urlStatRepositoryFactory(url: String) = Factory { | ||
| UrlStatusRepositoryImpl( | ||
| url = url, | ||
| httpClient = httpClient, | ||
| dispatchers = dispatchers | ||
| ) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...atus/mincraft/MinecraftStatusComponent.kt → ...tus/minecraft/MinecraftStatusComponent.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters