Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auto format extension repo URLs

Browse Source 
Closes #1392
Closes #1393

(cherry picked from commit 22d8aad598bea8f00f2831779e45a6645392ca0f)

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
AntsyLich 2024-10-31 18:50:22 +06:00 committed by Jobobby04
parent fd32f2e879
commit 2187731d70
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
domain/src/main/java/mihon/domain/extensionrepo/interactor/CreateExtensionRepo.kt
View File

@ -5,6 +5,7 @@ import mihon.domain.extensionrepo.exception.SaveExtensionRepoException
import mihon.domain.extensionrepo.model.ExtensionRepo import mihon.domain.extensionrepo.model.ExtensionRepo
import mihon.domain.extensionrepo.repository.ExtensionRepoRepository import mihon.domain.extensionrepo.repository.ExtensionRepoRepository
import mihon.domain.extensionrepo.service.ExtensionRepoService import mihon.domain.extensionrepo.service.ExtensionRepoService
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import tachiyomi.core.common.util.system.logcat import tachiyomi.core.common.util.system.logcat
class CreateExtensionRepo( class CreateExtensionRepo(
@ -13,12 +14,13 @@ class CreateExtensionRepo(
) { ) {
private val repoRegex = """^https://.*/index\.min\.json$""".toRegex() private val repoRegex = """^https://.*/index\.min\.json$""".toRegex()
suspend fun await(repoUrl: String): Result { suspend fun await(indexUrl: String): Result {
if (!repoUrl.matches(repoRegex)) { val formattedIndexUrl = indexUrl.toHttpUrlOrNull()
return Result.InvalidUrl ?.toString()
} ?.takeIf { it.matches(repoRegex) }
?: return Result.InvalidUrl
val baseUrl = repoUrl.removeSuffix("/index.min.json") val baseUrl = formattedIndexUrl.removeSuffix("/index.min.json")
return service.fetchRepoDetails(baseUrl)?.let { insert(it) } ?: Result.InvalidUrl return service.fetchRepoDetails(baseUrl)?.let { insert(it) } ?: Result.InvalidUrl
} }

5
domain/src/main/java/mihon/domain/extensionrepo/service/ExtensionRepoService.kt
View File

@ -1,6 +1,5 @@
package mihon.domain.extensionrepo.service package mihon.domain.extensionrepo.service
import androidx.core.net.toUri
import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.NetworkHelper import eu.kanade.tachiyomi.network.NetworkHelper
import eu.kanade.tachiyomi.network.awaitSuccess import eu.kanade.tachiyomi.network.awaitSuccess
@ -21,11 +20,9 @@ class ExtensionRepoService(
repo: String, repo: String,
): ExtensionRepo? { ): ExtensionRepo? {
return withIOContext { return withIOContext {
val url = "$repo/repo.json".toUri()
try { try {
with(json) { with(json) {
client.newCall(GET(url.toString())) client.newCall(GET("$repo/repo.json"))
.awaitSuccess() .awaitSuccess()
.parseAs<ExtensionRepoMetaDto>() .parseAs<ExtensionRepoMetaDto>()
.toExtensionRepo(baseUrl = repo) .toExtensionRepo(baseUrl = repo)