mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-10-09 12:59:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tweak the app updater logic and add FOSS build support (#1843)

Browse Source
This commit is contained in:
AntsyLich
2025-03-18 19:36:16 +06:00
committed by GitHub
parent 7028b8673a
commit 28093935d8
11 changed files with 85 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt
View File

@@ -123,7 +123,7 @@ object AboutScreen : Screen() {
versionName = result.release.version,
changelogInfo = result.release.info,
releaseLink = result.release.releaseLink,
downloadLink = result.release.getDownloadLink(),
downloadLink = result.release.downloadLink,
)
navigator.push(updateScreen)
},

2
app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt
View File

@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.data.updater
import android.content.Context
import eu.kanade.tachiyomi.BuildConfig
import eu.kanade.tachiyomi.util.system.isFossBuildType
import eu.kanade.tachiyomi.util.system.isPreviewBuildType
import tachiyomi.core.common.util.lang.withIOContext
import tachiyomi.domain.release.interactor.GetApplicationRelease
@@ -20,6 +21,7 @@ class AppUpdateChecker {
return withIOContext {
val result = getApplicationRelease.await(
GetApplicationRelease.Arguments(
isFossBuildType,
isPreviewBuildType,
BuildConfig.COMMIT_COUNT.toInt(),
BuildConfig.VERSION_NAME,

2
app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt
View File

@@ -38,7 +38,7 @@ internal class AppUpdateNotifier(private val context: Context) {
fun promptUpdate(release: Release) {
val updateIntent = NotificationReceiver.downloadAppUpdatePendingBroadcast(
context,
release.getDownloadLink(),
release.downloadLink,
release.version,
)

2
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View File

@@ -312,7 +312,7 @@ class MainActivity : BaseActivity() {
versionName = result.release.version,
changelogInfo = result.release.info,
releaseLink = result.release.releaseLink,
downloadLink = result.release.getDownloadLink(),
downloadLink = result.release.downloadLink,
)
navigator.push(updateScreen)
}

3
app/src/main/java/eu/kanade/tachiyomi/util/system/BuildConfig.kt
View File

@@ -18,3 +18,6 @@ val isPreviewBuildType: Boolean
val isReleaseBuildType: Boolean
inline get() = BuildConfig.BUILD_TYPE == "release"
val isFossBuildType: Boolean
inline get() = BuildConfig.BUILD_TYPE == "foss"

45
data/src/main/java/tachiyomi/data/release/GithubRelease.kt
View File

@@ -2,47 +2,28 @@ package tachiyomi.data.release
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import tachiyomi.domain.release.model.Release
/**
* Contains information about the latest release from GitHub.
*/
@Serializable
data class GithubRelease(
@SerialName("tag_name") val version: String,
@SerialName("body") val info: String,
@SerialName("html_url") val releaseLink: String,
@SerialName("assets") val assets: List<GitHubAssets>,
@SerialName("tag_name")
val version: String,
@SerialName("body")
val info: String,
@SerialName("html_url")
val releaseLink: String,
@SerialName("assets")
val assets: List<GitHubAsset>,
)
/**
* Assets class containing download url.
* Asset class containing asset name and download url.
*/
@Serializable
data class GitHubAssets(@SerialName("browser_download_url") val downloadLink: String)
/**
* Regular expression that matches a mention to a valid GitHub username, like it's
* done in GitHub Flavored Markdown. It follows these constraints:
*
* - Alphanumeric with single hyphens (no consecutive hyphens)
* - Cannot begin or end with a hyphen
* - Max length of 39 characters
*
* Reference: https://stackoverflow.com/a/30281147
*/
val gitHubUsernameMentionRegex =
"""\B@([a-z0-9](?:-(?=[a-z0-9])|[a-z0-9]){0,38}(?<=[a-z0-9]))""".toRegex(
RegexOption.IGNORE_CASE,
data class GitHubAsset(
val name: String,
@SerialName("browser_download_url")
val downloadLink: String,
)
val releaseMapper: (GithubRelease) -> Release = {
Release(
it.version,
it.info.replace(gitHubUsernameMentionRegex) { mention ->
"[${mention.value}](https://github.com/${mention.value.substring(1)})"
},
it.releaseLink,
it.assets.map(GitHubAssets::downloadLink),
)
}

50
data/src/main/java/tachiyomi/data/release/ReleaseServiceImpl.kt
View File

@@ -1,10 +1,12 @@
package tachiyomi.data.release
import android.os.Build
import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.NetworkHelper
import eu.kanade.tachiyomi.network.awaitSuccess
import eu.kanade.tachiyomi.network.parseAs
import kotlinx.serialization.json.Json
import tachiyomi.domain.release.interactor.GetApplicationRelease
import tachiyomi.domain.release.model.Release
import tachiyomi.domain.release.service.ReleaseService
@@ -13,13 +15,53 @@ class ReleaseServiceImpl(
private val json: Json,
) : ReleaseService {
override suspend fun latest(repository: String): Release {
return with(json) {
override suspend fun latest(arguments: GetApplicationRelease.Arguments): Release? {
val release = with(json) {
networkService.client
.newCall(GET("https://api.github.com/repos/$repository/releases/latest"))
.newCall(GET("https://api.github.com/repos/${arguments.repository}/releases/latest"))
.awaitSuccess()
.parseAs<GithubRelease>()
.let(releaseMapper)
}
val downloadLink = getDownloadLink(release = release, isFoss = arguments.isFoss) ?: return null
return Release(
version = release.version,
info = release.info.replace(gitHubUsernameMentionRegex) { mention ->
"[${mention.value}](https://github.com/${mention.value.substring(1)})"
},
releaseLink = release.releaseLink,
downloadLink = downloadLink,
)
}
private fun getDownloadLink(release: GithubRelease, isFoss: Boolean): String? {
val map = release.assets.associate { asset ->
BUILD_TYPES.find { "-$it" in asset.name } to asset.downloadLink
}
return if (!isFoss) {
map[Build.SUPPORTED_ABIS[0]] ?: map[null]
} else {
map[FOSS]
}
}
companion object {
private const val FOSS = "foss"
private val BUILD_TYPES = listOf(FOSS, "arm64-v8a", "armeabi-v7a", "x86_64", "x86")
/**
* Regular expression that matches a mention to a valid GitHub username, like it's
* done in GitHub Flavored Markdown. It follows these constraints:
*
* - Alphanumeric with single hyphens (no consecutive hyphens)
* - Cannot begin or end with a hyphen
* - Max length of 39 characters
*
* Reference: https://stackoverflow.com/a/30281147
*/
private val gitHubUsernameMentionRegex = """\B@([a-z0-9](?:-(?=[a-z0-9])|[a-z0-9]){0,38}(?<=[a-z0-9]))"""
.toRegex(RegexOption.IGNORE_CASE)
}
}

3
domain/src/main/java/tachiyomi/domain/release/interactor/GetApplicationRelease.kt
View File

@@ -25,7 +25,7 @@ class GetApplicationRelease(
return Result.NoNewUpdate
}
val release = service.latest(arguments.repository)
val release = service.latest(arguments) ?: return Result.NoNewUpdate
lastChecked.set(now.toEpochMilli())
@@ -73,6 +73,7 @@ class GetApplicationRelease(
}
data class Arguments(
val isFoss: Boolean,
val isPreview: Boolean,
val commitCount: Int,
val versionName: String,

28
domain/src/main/java/tachiyomi/domain/release/model/Release.kt
View File

@@ -1,7 +1,5 @@
package tachiyomi.domain.release.model
import android.os.Build
/**
* Contains information about the latest release.
*/
@@ -9,27 +7,5 @@ data class Release(
val version: String,
val info: String,
val releaseLink: String,
private val assets: List<String>,
) {
/**
* Get download link of latest release from the assets.
* @return download link of latest release.
*/
fun getDownloadLink(): String {
val apkVariant = when (Build.SUPPORTED_ABIS[0]) {
"arm64-v8a" -> "-arm64-v8a"
"armeabi-v7a" -> "-armeabi-v7a"
"x86" -> "-x86"
"x86_64" -> "-x86_64"
else -> ""
}
return assets.find { it.contains("mihon$apkVariant-") } ?: assets[0]
}
/**
* Assets class containing download url.
*/
data class Assets(val downloadLink: String)
}
val downloadLink: String,
)

3
domain/src/main/java/tachiyomi/domain/release/service/ReleaseService.kt
View File

@@ -1,8 +1,9 @@
package tachiyomi.domain.release.service
import tachiyomi.domain.release.interactor.GetApplicationRelease
import tachiyomi.domain.release.model.Release
interface ReleaseService {
suspend fun latest(repository: String): Release
suspend fun latest(arguments: GetApplicationRelease.Arguments): Release?
}

18
domain/src/test/java/tachiyomi/domain/release/interactor/GetApplicationReleaseTest.kt
View File

@@ -16,9 +16,9 @@ import java.time.Instant
class GetApplicationReleaseTest {
lateinit var getApplicationRelease: GetApplicationRelease
lateinit var releaseService: ReleaseService
lateinit var preference: Preference<Long>
private lateinit var getApplicationRelease: GetApplicationRelease
private lateinit var releaseService: ReleaseService
private lateinit var preference: Preference<Long>
@BeforeEach
fun beforeEach() {
@@ -39,13 +39,14 @@ class GetApplicationReleaseTest {
"r2000",
"info",
"http://example.com/release_link",
listOf("http://example.com/assets"),
"http://example.com/release_link.apk",
)
coEvery { releaseService.latest(any()) } returns release
val result = getApplicationRelease.await(
GetApplicationRelease.Arguments(
isFoss = false,
isPreview = true,
commitCount = 1000,
versionName = "",
@@ -67,13 +68,14 @@ class GetApplicationReleaseTest {
"v2.0.0",
"info",
"http://example.com/release_link",
listOf("http://example.com/assets"),
"http://example.com/release_link.apk",
)
coEvery { releaseService.latest(any()) } returns release
val result = getApplicationRelease.await(
GetApplicationRelease.Arguments(
isFoss = false,
isPreview = false,
commitCount = 0,
versionName = "v1.0.0",
@@ -95,13 +97,14 @@ class GetApplicationReleaseTest {
"v1.0.0",
"info",
"http://example.com/release_link",
listOf("http://example.com/assets"),
"http://example.com/release_link.apk",
)
coEvery { releaseService.latest(any()) } returns release
val result = getApplicationRelease.await(
GetApplicationRelease.Arguments(
isFoss = false,
isPreview = false,
commitCount = 0,
versionName = "v2.0.0",
@@ -121,13 +124,14 @@ class GetApplicationReleaseTest {
"v1.0.0",
"info",
"http://example.com/release_link",
listOf("http://example.com/assets"),
"http://example.com/release_link.apk",
)
coEvery { releaseService.latest(any()) } returns release
val result = getApplicationRelease.await(
GetApplicationRelease.Arguments(
isFoss = false,
isPreview = false,
commitCount = 0,
versionName = "v2.0.0",