SheWhoReignsSupreme/GoonManager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: transition aliuhook versioning to semver

Browse source
This commit is contained in:
rushiiMachine 2025-02-09 13:08:44 -08:00
parent 8ba1f6d60b
commit b206041146
No known key found for this signature in database
GPG key ID: DCBE5952BB3B6420
5 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/kotlin/com/aliucord/manager/domain/repository/AliucordMavenRepository.kt
View file

@ -7,12 +7,15 @@ import io.ktor.http.HttpStatusCode
class AliucordMavenRepository( class AliucordMavenRepository(
private val maven: MavenService, private val maven: MavenService,
) { ) {
suspend fun getAliuhookVersion(): ApiResponse<String> { suspend fun getAliuhookVersion(): ApiResponse<SemVer> {
return maven.getArtifactMetadata(BASE_URL, ALIUHOOK).transform { return maven.getArtifactMetadata(BASE_URL, ALIUHOOK).transform {
"<release>(.+?)</release>".toRegex() val versionString = "<release>(.+?)</release>".toRegex()
.find(it) .find(it)
?.groupValues?.get(1) ?.groupValues?.get(1)
?: return ApiResponse.Error(ApiError(HttpStatusCode.OK, "No version in the aliuhook artifact metadata")) ?: return ApiResponse.Error(ApiError(HttpStatusCode.OK, "No version in the aliuhook artifact metadata"))
SemVer.parseOrNull(versionString)
?: return ApiResponse.Error(ApiError(HttpStatusCode.OK, "Invalid latest aliuhook version!"))
} }
} }
@ -20,8 +23,7 @@ class AliucordMavenRepository(
private const val BASE_URL = "https://maven.aliucord.com/snapshots" private const val BASE_URL = "https://maven.aliucord.com/snapshots"
private const val ALIUHOOK = "com.aliucord:Aliuhook" private const val ALIUHOOK = "com.aliucord:Aliuhook"
fun getAliuhookUrl(version: String): String { fun getAliuhookUrl(version: String): String =
return MavenService.getAARUrl(BASE_URL, "$ALIUHOOK:$version") "$BASE_URL/com/aliucord/Aliuhook/$version/Aliuhook-$version.aar"
}
} }
} }

2
app/src/main/kotlin/com/aliucord/manager/manager/PathManager.kt
View file

@ -71,7 +71,7 @@ class PathManager(context: Context) {
/** /**
* Resolve a specific path for a versioned cached Aliuhook build * Resolve a specific path for a versioned cached Aliuhook build
*/ */
fun cachedAliuhookAAR(version: String) = externalCacheDir fun cachedAliuhookAAR(version: SemVer) = externalCacheDir
.resolve("aliuhook").apply { mkdirs() } .resolve("aliuhook").apply { mkdirs() }
.resolve("$version.aar") .resolve("$version.aar")

9
app/src/main/kotlin/com/aliucord/manager/network/service/MavenService.kt
View file

@ -14,13 +14,4 @@ class MavenService(
url("$baseUrl/${coords}/maven-metadata.xml") url("$baseUrl/${coords}/maven-metadata.xml")
} }
} }
companion object {
fun getAARUrl(baseUrl: String, coords: String): String {
val parts = coords.split("[:.]".toRegex())
val artifact = parts[parts.lastIndex - 1]
val version = parts.last()
return "$baseUrl/${parts.joinToString("/")}/$artifact-$version.aar"
}
}
} }

2
app/src/main/kotlin/com/aliucord/manager/patcher/InstallMetadata.kt
View file

@ -27,7 +27,7 @@ data class InstallMetadata(
/** /**
* Version (commit hash) of the Aliuhook build that was injected into the APK. * Version (commit hash) of the Aliuhook build that was injected into the APK.
*/ */
val aliuhookVersion: String, val aliuhookVersion: SemVer,
/** /**
* Version of the injector build that was injected into the APK. * Version of the injector build that was injected into the APK.

5
app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadAliuhookStep.kt
View file

@ -4,6 +4,7 @@ import androidx.compose.runtime.Stable
import com.aliucord.manager.R import com.aliucord.manager.R
import com.aliucord.manager.domain.repository.AliucordMavenRepository import com.aliucord.manager.domain.repository.AliucordMavenRepository
import com.aliucord.manager.manager.PathManager import com.aliucord.manager.manager.PathManager
import com.aliucord.manager.network.utils.SemVer
import com.aliucord.manager.network.utils.getOrThrow import com.aliucord.manager.network.utils.getOrThrow
import com.aliucord.manager.patcher.StepRunner import com.aliucord.manager.patcher.StepRunner
import com.aliucord.manager.patcher.steps.base.DownloadStep import com.aliucord.manager.patcher.steps.base.DownloadStep
@ -25,11 +26,11 @@ class DownloadAliuhookStep : DownloadStep(), IDexProvider, KoinComponent {
/** /**
* This is populated right before the download starts (ref: [execute]) * This is populated right before the download starts (ref: [execute])
*/ */
lateinit var targetVersion: String lateinit var targetVersion: SemVer
private set private set
override val localizedName = R.string.patch_step_dl_aliuhook override val localizedName = R.string.patch_step_dl_aliuhook
override val targetUrl get() = AliucordMavenRepository.getAliuhookUrl(targetVersion) override val targetUrl get() = AliucordMavenRepository.getAliuhookUrl(targetVersion.toString())
override val targetFile get() = paths.cachedAliuhookAAR(targetVersion) override val targetFile get() = paths.cachedAliuhookAAR(targetVersion)
override suspend fun execute(container: StepRunner) { override suspend fun execute(container: StepRunner) {