strips/foundation
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/foundation.git synced 2025-11-04 11:39:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small amount of inspection cleanup.

Browse Source
This commit is contained in:
Kenneth Endfinger
2022-01-15 16:21:38 -05:00
parent 93d1888537
commit 9398ada817
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
buildSrc/src/main/kotlin/cloud/kubelet/foundation/gradle/SmartDownloader.kt
View File

@ -7,7 +7,7 @@ import java.security.MessageDigest
class SmartDownloader(val localFilePath: Path, val remoteDownloadUrl: URI, val sha256: String) {
fun download(): Boolean {
if (!checkLocalFileHash()) {
if (checkLocalFileHash() == HashResult.ValidHash) {
downloadRemoteFile()
return true
}
@ -19,14 +19,14 @@ class SmartDownloader(val localFilePath: Path, val remoteDownloadUrl: URI, val s
val remoteFileStream = url.openStream()
val localFileStream = Files.newOutputStream(localFilePath)
remoteFileStream.transferTo(localFileStream)
if (!checkLocalFileHash()) {
throw RuntimeException("Download of ${remoteDownloadUrl} did not result in valid hash.")
if (checkLocalFileHash() != HashResult.ValidHash) {
throw RuntimeException("Download of $remoteDownloadUrl did not result in valid hash.")
}
}
private fun checkLocalFileHash(): Boolean {
private fun checkLocalFileHash(): HashResult {
if (!Files.exists(localFilePath)) {
return false
return HashResult.DoesNotExist
}
val digest = MessageDigest.getInstance("SHA-256")
@ -45,7 +45,11 @@ class SmartDownloader(val localFilePath: Path, val remoteDownloadUrl: URI, val s
val sha256Bytes = digest.digest()
val localSha256Hash = bytesToHex(sha256Bytes)
return localSha256Hash.equals(sha256, ignoreCase = true)
return if (localSha256Hash.equals(sha256, ignoreCase = true)) {
HashResult.ValidHash
} else {
HashResult.InvalidHash
}
}
private fun bytesToHex(hash: ByteArray): String {
@ -59,4 +63,10 @@ class SmartDownloader(val localFilePath: Path, val remoteDownloadUrl: URI, val s
}
return hexString.toString()
}
enum class HashResult {
DoesNotExist,
InvalidHash,
ValidHash
}
}

6
foundation-core/src/main/kotlin/cloud/kubelet/foundation/core/features/gameplay/GameplayFeature.kt
View File

@ -17,12 +17,6 @@ import kotlin.io.path.inputStream
class GameplayFeature : Feature() {
private val config by inject<GameplayConfig>()
override fun enable() {
}
override fun disable() {
}
override fun module() = module {
single {
val configPath = Util.copyDefaultConfig<FoundationCorePlugin>(